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

Centralize current Folder checks to prevent bugs (which there were)

Browse source
This commit is contained in:
the-djmaze 2022-09-07 23:39:46 +02:00
parent 0c90875b61
commit f451af2188
5 changed files with 46 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

26
dev/View/User/MailBox/MessageList.js
View file

@ -4,8 +4,6 @@ import { Scope } from 'Common/Enums';
import { ComposeType, FolderType, MessageSetAction } from 'Common/EnumsUser';
import { UNUSED_OPTION_VALUE } from 'Common/Consts';
import { doc, leftPanelDisabled, moveAction,
Settings, SettingsCapa, SettingsGet,
addEventsListeners,
@ -70,6 +68,9 @@ export class MailMessageList extends AbstractViewRight {
this.allowDangerousActions = SettingsCapa('DangerousActions');
this.messageList = MessagelistUserStore;
this.archiveAllowed = MessagelistUserStore.archiveAllowed;
this.isSpamAllowed = MessagelistUserStore.isSpamAllowed;
this.isUnSpamAllowed = MessagelistUserStore.isUnSpamAllowed;
this.composeInEdit = AppUserStore.composeInEdit;
@ -135,25 +136,6 @@ export class MailMessageList extends AbstractViewRight {
return c && MessagelistUserStore().length > c;
},
isSpamFolder: () => (FolderUserStore.spamFolder() || 0) === MessagelistUserStore().Folder,
isTrashFolder: () => (FolderUserStore.trashFolder() || 0) === MessagelistUserStore().Folder,
isDraftFolder: () => (FolderUserStore.draftsFolder() || 0) === MessagelistUserStore().Folder,
archiveAllowed: () =>
(FolderUserStore.archiveFolder() || 0) !== MessagelistUserStore().Folder
&& UNUSED_OPTION_VALUE !== FolderUserStore.archiveFolder()
&& !this.isDraftFolder(),
spamAllowed: () => UNUSED_OPTION_VALUE !== FolderUserStore.spamFolder()
&& (FolderUserStore.sentFolder() || 0) !== MessagelistUserStore().Folder
&& !this.isDraftFolder(),
isSpamVisible: () => !this.isSpamFolder() && this.spamAllowed(),
isUnSpamVisible: () => this.isSpamFolder() && this.spamAllowed(),
mobileCheckedStateShow: () => ThemeStore.isMobile() ? MessagelistUserStore.listChecked().length : 1,
mobileCheckedStateHide: () => ThemeStore.isMobile() ? !MessagelistUserStore.listChecked().length : 1,
@ -596,7 +578,7 @@ export class MailMessageList extends AbstractViewRight {
!MessagelistUserStore.error() &&
!MessagelistUserStore.endThreadUid() &&
MessagelistUserStore().length &&
(this.isSpamFolder() || this.isTrashFolder())
(MessagelistUserStore.isSpamFolder() || MessagelistUserStore.isTrashFolder())
);
}