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

Remove capa.Folders and always allow mailbox folders

Browse source
This commit is contained in:
djmaze 2021-03-06 10:07:54 +01:00
parent 1ac96c93d6
commit e8deb4ff16
16 changed files with 21 additions and 105 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,7 +1,6 @@
import ko from 'ko';
import {
Capa,
KeyState,
StorageResultType,
Notification,
@ -128,7 +127,6 @@ class ComposePopupView extends AbstractViewPopup {
this.sLastFocusedField = 'to';
this.allowContacts = !!AppStore.contactsIsAllowed();
this.allowFolders = !!Settings.capa(Capa.Folders);
this.bSkipNextHide = false;
this.composeInEdit = AppStore.composeInEdit;
@ -398,10 +396,6 @@ class ComposePopupView extends AbstractViewPopup {
}
}
if (!this.allowFolders) {
sSentFolder = UNUSED_OPTION_VALUE;
}
if (!sSentFolder) {
showScreenPopup(FolderSystemPopupView, [SetSystemFoldersNotification.Sent]);
} else {
@ -437,10 +431,6 @@ class ComposePopupView extends AbstractViewPopup {
}
saveCommand() {
if (!this.allowFolders) {
return false;
}
if (FolderStore.draftFolderNotEnabled()) {
showScreenPopup(FolderSystemPopupView, [SetSystemFoldersNotification.Draft]);
} else {
@ -1146,16 +1136,14 @@ class ComposePopupView extends AbstractViewPopup {
return false;
});
if (this.allowFolders) {
shortcuts.add('s', 'meta', KeyState.Compose, () => {
this.saveCommand();
return false;
});
shortcuts.add('save', KeyState.Compose, () => {
this.saveCommand();
return false;
});
}
shortcuts.add('s', 'meta', KeyState.Compose, () => {
this.saveCommand();
return false;
});
shortcuts.add('save', KeyState.Compose, () => {
this.saveCommand();
return false;
});
if (Settings.app('allowCtrlEnterOnCompose')) {
shortcuts.add('enter', 'meta', KeyState.Compose, () => {

1
dev/View/User/MailBox/FolderList.js
View file

@ -40,7 +40,6 @@ export class FolderListMailBoxUserView extends AbstractViewLeft {
this.allowComposer = !!Settings.capa(Capa.Composer);
this.allowContacts = !!AppStore.contactsIsAllowed();
this.allowFolders = !!Settings.capa(Capa.Folders);
this.folderListFocused = ko.computed(() => Focused.FolderList === AppStore.focusedState());

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

@ -69,7 +69,6 @@ export class MessageListMailBoxUserView extends AbstractViewRight {
this.allowComposer = !!Settings.capa(Capa.Composer);
this.allowMessageListActions = !!Settings.capa(Capa.MessageListActions);
this.allowDangerousActions = !!Settings.capa(Capa.DangerousActions);
this.allowFolders = !!Settings.capa(Capa.Folders);
this.popupVisibility = popupVisibility;