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

Settings.capa() to SettingsCapa()

Browse source
This commit is contained in:
the-djmaze 2022-02-08 14:13:06 +01:00
parent 51e391c4d6
commit 827421e116
5 changed files with 28 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -13,7 +13,7 @@ import {
import { UNUSED_OPTION_VALUE } from 'Common/Consts';
import { doc, leftPanelDisabled, moveAction, Settings, SettingsGet } from 'Common/Globals';
import { doc, leftPanelDisabled, moveAction, Settings, SettingsCapa, SettingsGet } from 'Common/Globals';
import { computedPaginatorHelper, showMessageComposer, folderListOptionsBuilder } from 'Common/UtilsUser';
import { FileInfo } from 'Common/File';
@ -58,9 +58,9 @@ export class MailMessageList extends AbstractViewRight {
this.newMoveToFolder = !!SettingsGet('NewMoveToFolder');
this.allowSearch = Settings.capa(Capa.Search);
this.allowSearchAdv = Settings.capa(Capa.SearchAdv);
this.allowDangerousActions = Settings.capa(Capa.DangerousActions);
this.allowSearch = SettingsCapa(Capa.Search);
this.allowSearchAdv = SettingsCapa(Capa.SearchAdv);
this.allowDangerousActions = SettingsCapa(Capa.DangerousActions);
this.messageList = MessageUserStore.list;
@ -256,7 +256,7 @@ export class MailMessageList extends AbstractViewRight {
}
clearCommand() {
if (Settings.capa(Capa.DangerousActions)) {
if (SettingsCapa(Capa.DangerousActions)) {
showScreenPopup(FolderClearPopupView, [FolderUserStore.currentFolder()]);
}
}
@ -275,7 +275,7 @@ export class MailMessageList extends AbstractViewRight {
}
deleteWithoutMoveCommand() {
if (Settings.capa(Capa.DangerousActions)) {
if (SettingsCapa(Capa.DangerousActions)) {
rl.app.deleteMessagesFromFolder(
FolderType.Trash,
FolderUserStore.currentFolderFullName(),
@ -770,7 +770,7 @@ export class MailMessageList extends AbstractViewRight {
return false;
});
if (Settings.capa(Capa.Search)) {
if (SettingsCapa(Capa.Search)) {
// search input focus
shortcuts.add('/', '', [Scope.MessageList, Scope.MessageView], () => {
this.inputMessageListSearchFocus(true);
@ -808,7 +808,7 @@ export class MailMessageList extends AbstractViewRight {
shortcuts.add('arrowleft', 'meta', Scope.MessageView, ()=>false);
shortcuts.add('arrowright', 'meta', Scope.MessageView, ()=>false);
if (!ThemeStore.isMobile() && Settings.capa(Capa.Prefetch)) {
if (!ThemeStore.isMobile() && SettingsCapa(Capa.Prefetch)) {
ifvisible.idle(this.prefetchNextTick.bind(this));
}
}
@ -839,7 +839,7 @@ export class MailMessageList extends AbstractViewRight {
}
advancedSearchClick() {
Settings.capa(Capa.SearchAdv)
SettingsCapa(Capa.SearchAdv)
&& showScreenPopup(AdvancedSearchPopupView, [MessageUserStore.mainMessageListSearch()]);
}

5
dev/View/User/MailBox/MessageView.js
View file

@ -21,6 +21,7 @@ import {
keyScopeReal,
moveAction,
Settings,
SettingsCapa,
getFullscreenElement,
exitFullscreen
} from 'Common/Globals';
@ -139,7 +140,7 @@ export class MailMessageView extends AbstractViewRight {
this.moveAction = moveAction;
this.allowMessageActions = Settings.capa(Capa.MessageActions);
this.allowMessageActions = SettingsCapa(Capa.MessageActions);
const attachmentsActions = Settings.app('attachmentsActions');
this.attachmentsActions = ko.observableArray(arrayLength(attachmentsActions) ? attachmentsActions : []);
@ -179,7 +180,7 @@ export class MailMessageView extends AbstractViewRight {
this.viewHash = '';
this.addComputables({
allowAttachmentControls: () => this.attachmentsActions.length && Settings.capa(Capa.AttachmentsActions),
allowAttachmentControls: () => this.attachmentsActions.length && SettingsCapa(Capa.AttachmentsActions),
downloadAsZipAllowed: () => this.attachmentsActions.includes('zip') && this.allowAttachmentControls(),