Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-07-11 08:24:50 +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

9
dev/Screen/User/MailBox.js
View file

@ -1,6 +1,5 @@
import { Capa } from 'Common/Enums';
import { Focused } from 'Common/EnumsUser';
import { doc, leftPanelDisabled, leftPanelType, moveAction, Settings } from 'Common/Globals';
import { doc, leftPanelDisabled, moveAction, Settings } from 'Common/Globals';
import { pString, pInt } from 'Common/Utils';
import { getFolderFromCacheList, getFolderFullNameRaw, getFolderInboxName } from 'Common/Cache';
import { i18n } from 'Common/Translator';
@ -58,12 +57,6 @@ export class MailBoxUserScreen extends AbstractScreen {
AppStore.focusedState(Focused.MessageList);
ThemeStore.isMobile() && leftPanelDisabled(true);
if (Settings.capa(Capa.Folders)) {
leftPanelType('');
} else {
leftPanelType(Settings.capa(Capa.Composer) || Settings.capa(Capa.Contacts) ? 'short' : 'none');
}
}
/**

8
dev/Screen/User/Settings.js
View file

@ -1,5 +1,5 @@
import { Capa, KeyState } from 'Common/Enums';
import { keyScope, leftPanelType, leftPanelDisabled, Settings } from 'Common/Globals';
import { keyScope, leftPanelDisabled, Settings } from 'Common/Globals';
import { runSettingsViewModelHooks } from 'Common/Plugins';
import { initOnStartOrLangChange, i18n } from 'Common/Translator';
@ -77,9 +77,7 @@ export class SettingsUserScreen extends AbstractSettingsScreen {
);
}
if (Settings.capa(Capa.Folders)) {
settingsAddViewModel(FoldersUserSettings, 'SettingsFolders', 'SETTINGS_LABELS/LABEL_FOLDERS_NAME', 'folders');
}
settingsAddViewModel(FoldersUserSettings, 'SettingsFolders', 'SETTINGS_LABELS/LABEL_FOLDERS_NAME', 'folders');
if (Settings.capa(Capa.Themes)) {
settingsAddViewModel(ThemesUserSettings, 'SettingsThemes', 'SETTINGS_LABELS/LABEL_THEMES_NAME', 'themes');
@ -99,8 +97,6 @@ export class SettingsUserScreen extends AbstractSettingsScreen {
onShow() {
this.setSettingsTitle();
keyScope(KeyState.Settings);
leftPanelType('');
ThemeStore.isMobile() && leftPanelDisabled(true);
}