mirror of
https://github.com/the-djmaze/snappymail.git
synced 2024-09-20 15:45:55 +08:00
Resolve issue #123
This commit is contained in:
parent
8934205ede
commit
5db8f032b8
|
@ -380,8 +380,8 @@ class AppUser extends AbstractApp {
|
|||
.then(() => promise)
|
||||
.then(
|
||||
() => Remote.foldersReloadWithTimeout(),
|
||||
errorCode => {
|
||||
FolderUserStore.folderListError(getNotification(errorCode, '', errorDefCode));
|
||||
error => {
|
||||
FolderUserStore.folderListError(getNotification(error.code, '', errorDefCode) + '.\n' + error.message);
|
||||
Remote.foldersReloadWithTimeout();
|
||||
}
|
||||
);
|
||||
|
|
|
@ -63,6 +63,14 @@ fetchJSON = (action, sGetAdd, params, timeout, jsonCallback) => {
|
|||
return rl.fetchJSON(getURL(sGetAdd), init, sGetAdd ? null : params).then(jsonCallback);
|
||||
};
|
||||
|
||||
class FetchError extends Error
|
||||
{
|
||||
constructor(code, message) {
|
||||
super(message);
|
||||
this.code = code || Notification.JsonFalse;
|
||||
}
|
||||
}
|
||||
|
||||
export class AbstractFetchRemote
|
||||
{
|
||||
abort(sAction, bClearOnly) {
|
||||
|
@ -201,8 +209,10 @@ export class AbstractFetchRemote
|
|||
|
||||
if (!data.Result || action !== data.Action) {
|
||||
checkResponseError(data);
|
||||
const err = data ? data.ErrorCode : 0;
|
||||
return Promise.reject(err || Notification.JsonFalse);
|
||||
return Promise.reject(new FetchError(
|
||||
data ? data.ErrorCode : 0,
|
||||
data ? (data.ErrorMessageAdditional || data.ErrorMessage) : ''
|
||||
));
|
||||
}
|
||||
|
||||
return data;
|
||||
|
|
Loading…
Reference in a new issue