the-djmaze/snappymail
1
1
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2025-02-25 15:26:14 +08:00
Code Issues Projects Releases Packages Wiki Activity

cleanup code a bit

Browse source
This commit is contained in:
the-djmaze 2022-09-27 23:55:29 +02:00
parent 0fce269a82
commit 1fee4fc940
1 changed files with 7 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
dev/App/User.js
View file

@ -86,8 +86,7 @@ export class AppUser extends AbstractApp {
lastTime = currentTime; lastTime = currentTime;
}, interval); }, interval);
const fn = (ev=>$htmlCL.toggle('rl-ctrl-key-pressed', ev.ctrlKey)).debounce(500); addEventsListener(doc, ['keydown','keyup'], (ev=>$htmlCL.toggle('rl-ctrl-key-pressed', ev.ctrlKey)).debounce(500));
addEventsListener(doc, ['keydown','keyup'], fn);
addShortcut('escape,enter', '', dropdownsDetectVisibility); addShortcut('escape,enter', '', dropdownsDetectVisibility);
addEventListener('click', dropdownsDetectVisibility); addEventListener('click', dropdownsDetectVisibility);
@ -116,6 +115,7 @@ export class AppUser extends AbstractApp {
case FolderType.Spam: case FolderType.Spam:
oMoveFolder = getFolderFromCacheList(FolderUserStore.spamFolder()); oMoveFolder = getFolderFromCacheList(FolderUserStore.spamFolder());
nSetSystemFoldersNotification = SetSystemFoldersNotification.Spam; nSetSystemFoldersNotification = SetSystemFoldersNotification.Spam;
bDelete = bDelete || UNUSED_OPTION_VALUE === FolderUserStore.spamFolder();
break; break;
case FolderType.NotSpam: case FolderType.NotSpam:
oMoveFolder = getFolderFromCacheList(getFolderInboxName()); oMoveFolder = getFolderFromCacheList(getFolderInboxName());
@ -123,30 +123,21 @@ export class AppUser extends AbstractApp {
case FolderType.Trash: case FolderType.Trash:
oMoveFolder = getFolderFromCacheList(FolderUserStore.trashFolder()); oMoveFolder = getFolderFromCacheList(FolderUserStore.trashFolder());
nSetSystemFoldersNotification = SetSystemFoldersNotification.Trash; nSetSystemFoldersNotification = SetSystemFoldersNotification.Trash;
bDelete = bDelete || UNUSED_OPTION_VALUE === FolderUserStore.trashFolder()
|| sFromFolderFullName === FolderUserStore.spamFolder()
|| sFromFolderFullName === FolderUserStore.trashFolder();
break; break;
case FolderType.Archive: case FolderType.Archive:
oMoveFolder = getFolderFromCacheList(FolderUserStore.archiveFolder()); oMoveFolder = getFolderFromCacheList(FolderUserStore.archiveFolder());
nSetSystemFoldersNotification = SetSystemFoldersNotification.Archive; nSetSystemFoldersNotification = SetSystemFoldersNotification.Archive;
bDelete = bDelete || UNUSED_OPTION_VALUE === FolderUserStore.archiveFolder();
break; break;
// no default // no default
} }
if (!bDelete && (
(FolderType.Spam === iFolderType && UNUSED_OPTION_VALUE === FolderUserStore.spamFolder()) ||
(FolderType.Trash === iFolderType && UNUSED_OPTION_VALUE === FolderUserStore.trashFolder()) ||
(FolderType.Archive === iFolderType && UNUSED_OPTION_VALUE === FolderUserStore.archiveFolder())
)) {
bDelete = true;
}
if (!oMoveFolder && !bDelete) { if (!oMoveFolder && !bDelete) {
showScreenPopup(FolderSystemPopupView, [nSetSystemFoldersNotification]); showScreenPopup(FolderSystemPopupView, [nSetSystemFoldersNotification]);
} else if ( } else if (bDelete) {
bDelete ||
(FolderType.Trash === iFolderType &&
(sFromFolderFullName === FolderUserStore.spamFolder()
|| sFromFolderFullName === FolderUserStore.trashFolder()))
) {
showScreenPopup(AskPopupView, [ showScreenPopup(AskPopupView, [
i18n('POPUPS_ASK/DESC_WANT_DELETE_MESSAGES'), i18n('POPUPS_ASK/DESC_WANT_DELETE_MESSAGES'),
() => { () => {