Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-07-10 06:58:27 +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

6
dev/Settings/Admin/Packages.js
View file

@ -1,6 +1,6 @@
import ko from 'ko';
import { Notification } from 'Common/Enums';
import { Notifications } from 'Common/Enums';
import { getNotification } from 'Common/Translator';
import { PackageAdminStore } from 'Stores/Admin/Package';
@ -67,7 +67,7 @@ export class AdminSettingsPackages extends AbstractViewSettings {
if (iError) {
this.packagesError(
getNotification(install ? Notification.CantInstallPackage : Notification.CantDeletePackage)
getNotification(install ? Notifications.CantInstallPackage : Notifications.CantDeletePackage)
+ (data.ErrorMessage ? ':\n' + data.ErrorMessage : '')
);
} else if (data.Result.Reload) {
@ -113,7 +113,7 @@ export class AdminSettingsPackages extends AbstractViewSettings {
if (iError) {
plugin.enabled(disable);
this.packagesError(
(Notification.UnsupportedPluginPackage === iError && data?.ErrorMessage)
(Notifications.UnsupportedPluginPackage === iError && data?.ErrorMessage)
? data.ErrorMessage
: getNotification(iError)
);

10
dev/Settings/User/Folders.js
View file

@ -1,6 +1,6 @@
import ko from 'ko';
import { Notification } from 'Common/Enums';
import { Notifications } from 'Common/Enums';
import { FolderMetadataKeys } from 'Common/EnumsUser';
import { getNotification } from 'Common/Translator';
@ -84,7 +84,7 @@ export class UserSettingsFolders /*extends AbstractViewSettings*/ {
})
.catch(error => {
FolderUserStore.folderListError(
getNotification(error.code, '', Notification.CantRenameFolder)
getNotification(error.code, '', Notifications.CantRenameFolder)
+ '.\n' + error.message);
});
}
@ -119,8 +119,8 @@ export class UserSettingsFolders /*extends AbstractViewSettings*/ {
&& folderToRemove.askDelete()
) {
if (0 < folderToRemove.totalEmails()) {
// FolderUserStore.folderListError(getNotification(Notification.CantDeleteNonEmptyFolder));
folderToRemove.errorMsg(getNotification(Notification.CantDeleteNonEmptyFolder));
// FolderUserStore.folderListError(getNotification(Notifications.CantDeleteNonEmptyFolder));
folderToRemove.errorMsg(getNotification(Notifications.CantDeleteNonEmptyFolder));
} else {
folderForDeletion(null);
@ -141,7 +141,7 @@ export class UserSettingsFolders /*extends AbstractViewSettings*/ {
},
error => {
FolderUserStore.folderListError(
getNotification(error.code, '', Notification.CantDeleteFolder)
getNotification(error.code, '', Notifications.CantDeleteFolder)
+ '.\n' + error.message
);
}