Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-07-08 22:18:28 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bugfix: Notification enum conflicts with window.Notification

Browse source
This commit is contained in:
the-djmaze 2023-02-20 15:59:37 +01:00
parent b5ab175953
commit 8d52b0afdf
13 changed files with 47 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

12
dev/View/Popup/Compose.js
View file

@ -1,7 +1,7 @@
import ko from 'ko';
import {
Notification,
Notifications,
UploadErrorCode
} from 'Common/Enums';
@ -458,13 +458,13 @@ export class ComposePopupView extends AbstractViewPopup {
(iError, data) => {
this.sending(false);
if (iError) {
if (Notification.CantSaveMessage === iError) {
if (Notifications.CantSaveMessage === iError) {
this.sendSuccessButSaveError(true);
this.savedErrorDesc(i18n('COMPOSE/SAVED_ERROR_ON_SEND').trim());
} else {
this.sendError(true);
this.sendErrorDesc(getNotification(iError, data?.ErrorMessage)
|| getNotification(Notification.CantSendMessage));
|| getNotification(Notifications.CantSendMessage));
}
} else {
this.close();
@ -531,7 +531,7 @@ export class ComposePopupView extends AbstractViewPopup {
if (!result) {
this.savedError(true);
this.savedErrorDesc(getNotification(Notification.CantSaveMessage));
this.savedErrorDesc(getNotification(Notifications.CantSaveMessage));
}
reloadDraftFolder();
@ -542,7 +542,7 @@ export class ComposePopupView extends AbstractViewPopup {
}).catch(e => {
this.saving(false);
this.savedError(true);
this.savedErrorDesc(getNotification(Notification.CantSaveMessage) + ': ' + e);
this.savedErrorDesc(getNotification(Notifications.CantSaveMessage) + ': ' + e);
});
}
}
@ -612,7 +612,7 @@ export class ComposePopupView extends AbstractViewPopup {
data.Result.map(item => (item?.[0] ? (new EmailModel(item[0], item[1])).toLine() : null))
.filter(v => v)
);
} else if (Notification.RequestAborted !== iError) {
} else if (Notifications.RequestAborted !== iError) {
fResponse([]);
}
},

4
dev/View/Popup/FolderCreate.js
View file

@ -1,6 +1,6 @@
import { koComputable, addObservablesTo } from 'External/ko';
import { Notification } from 'Common/Enums';
import { Notifications } from 'Common/Enums';
import { defaultOptionsAfterRender } from 'Common/Utils';
import { folderListOptionsBuilder, sortFolders } from 'Common/Folders';
import { getNotification } from 'Common/Translator';
@ -65,7 +65,7 @@ export class FolderCreatePopupView extends AbstractViewPopup {
},
error => {
FolderUserStore.folderListError(
getNotification(error.code, '', Notification.CantCreateFolder)
getNotification(error.code, '', Notifications.CantCreateFolder)
+ '.\n' + error.message);
}
);

8
dev/View/User/Login.js
View file

@ -1,4 +1,4 @@
import { Notification } from 'Common/Enums';
import { Notifications } from 'Common/Enums';
import { ClientSideKeyNameLastSignMe } from 'Common/EnumsUser';
import { SettingsGet, fireEvent } from 'Common/Globals';
import { getNotification, translatorReload, convertLangName } from 'Common/Translator';
@ -120,11 +120,11 @@ export class LoginUserView extends AbstractViewLogin {
});
if (iError) {
this.submitRequest(false);
if (Notification.InvalidInputArgument == iError) {
iError = Notification.AuthError;
if (Notifications.InvalidInputArgument == iError) {
iError = Notifications.AuthError;
}
this.submitError(getNotification(iError, oData?.ErrorMessage,
Notification.UnknownNotification));
Notifications.UnknownNotification));
this.submitErrorAdditional(oData?.ErrorMessageAdditional);
} else {
rl.setData(oData.Result);