Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-08-29 12:09:20 +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

2
dev/Common/Enums.js
View file

@ -39,7 +39,7 @@ SaveSettingStatus = {
/**
* @enum {number}
*/
Notification = {
Notifications = {
RequestError: 1,
RequestAborted: 2,
RequestTimeout: 3,

6
dev/Common/Translator.js
View file

@ -1,5 +1,5 @@
import ko from 'ko';
import { Notification, UploadErrorCode } from 'Common/Enums';
import { Notifications, UploadErrorCode } from 'Common/Enums';
import { langLink } from 'Common/Links';
import { doc, createElement } from 'Common/Globals';
import { getKeyByValue, forEachObjectEntry } from 'Common/Utils';
@ -20,7 +20,7 @@ const
i18nKey = key => key.replace(/([a-z])([A-Z])/g, '$1_$2').toUpperCase(),
getNotificationMessage = code => {
let key = getKeyByValue(Notification, code);
let key = getKeyByValue(Notifications, code);
return key ? I18N_DATA.NOTIFICATIONS[i18nKey(key).replace('_NOTIFICATION', '_ERROR')] : '';
},
@ -176,7 +176,7 @@ export const
*/
getNotification = (code, message = '', defCode = 0) => {
code = pInt(code);
if (Notification.ClientViewError === code && message) {
if (Notifications.ClientViewError === code && message) {
return message;
}

4
dev/Common/UtilsUser.js
View file

@ -1,5 +1,5 @@
import { MessageFlagsCache } from 'Common/Cache';
import { Notification } from 'Common/Enums';
import { Notifications } from 'Common/Enums';
import { MessageSetAction, ComposeType/*, FolderType*/ } from 'Common/EnumsUser';
import { doc, createElement, elementById, dropdowns, dropdownVisibility, SettingsGet, leftPanelDisabled } from 'Common/Globals';
import { plainToHtml } from 'Common/Html';
@ -293,7 +293,7 @@ populateMessageBody = (oMessage, popup) => {
popup || MessageUserStore.loading(true);
Remote.message((iError, oData/*, bCached*/) => {
if (iError) {
if (Notification.RequestAborted !== iError && !popup) {
if (Notifications.RequestAborted !== iError && !popup) {
MessageUserStore.message(null);
MessageUserStore.error(getNotification(iError));
}