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

Improved boot.js with existing global window.rl

Browse source 
Put dev/Storage/Settings.js in boots.js global rl.settings
This commit is contained in:
djmaze 2020-09-04 12:05:17 +02:00
parent f90dbcc84b
commit aeb5275648
57 changed files with 284 additions and 380 deletions
Download patch file Download diff file Expand all files Collapse all files

4
dev/Screen/Admin/Login.js
View file

@ -1,7 +1,5 @@
import { AbstractScreen } from 'Knoin/AbstractScreen';
import { getApp } from 'Helper/Apps/Admin';
import { LoginAdminView } from 'View/Admin/Login';
class LoginAdminScreen extends AbstractScreen {
@ -10,7 +8,7 @@ class LoginAdminScreen extends AbstractScreen {
}
onShow() {
getApp().setWindowTitle('');
rl.setWindowTitle();
}
}

4
dev/Screen/Admin/Settings.js
View file

@ -12,8 +12,6 @@ import { PluginsAdminSettings } from 'Settings/Admin/Plugins';
import { PackagesAdminSettings } from 'Settings/Admin/Packages';
import { AboutAdminSettings } from 'Settings/Admin/About';
import { getApp } from 'Helper/Apps/Admin';
import { MenuSettingsAdminView } from 'View/Admin/Settings/Menu';
import { PaneSettingsAdminView } from 'View/Admin/Settings/Pane';
@ -60,7 +58,7 @@ class SettingsAdminScreen extends AbstractSettingsScreen {
}
onShow() {
getApp().setWindowTitle('');
rl.setWindowTitle();
}
}

4
dev/Screen/User/Login.js
View file

@ -2,15 +2,13 @@ import { AbstractScreen } from 'Knoin/AbstractScreen';
import { LoginUserView } from 'View/User/Login';
import { getApp } from 'Helper/Apps/User';
class LoginUserScreen extends AbstractScreen {
constructor() {
super('login', [LoginUserView]);
}
onShow() {
getApp().setWindowTitle('');
rl.setWindowTitle();
}
}

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

@ -4,8 +4,6 @@ import { pString, pInt } from 'Common/Utils';
import { getFolderFromCacheList, getFolderFullNameRaw, getFolderInboxName } from 'Common/Cache';
import { i18n } from 'Common/Translator';
import * as Settings from 'Storage/Settings';
import AppStore from 'Stores/User/App';
import AccountStore from 'Stores/User/Account';
import SettingsStore from 'Stores/User/Settings';
@ -23,6 +21,8 @@ import { warmUpScreenPopup } from 'Knoin/Knoin';
import { AbstractScreen } from 'Knoin/AbstractScreen';
const Settings = rl.settings;
class MailBoxUserScreen extends AbstractScreen {
constructor() {
super('mailbox', [
@ -40,11 +40,11 @@ class MailBoxUserScreen extends AbstractScreen {
let foldersInboxUnreadCount = FolderStore.foldersInboxUnreadCount();
const email = AccountStore.email();
if (Settings.appSettingsGet('listPermanentFiltered')) {
if (Settings.app('listPermanentFiltered')) {
foldersInboxUnreadCount = 0;
}
getApp().setWindowTitle(
rl.setWindowTitle(
(email
? '' + (0 < foldersInboxUnreadCount ? '(' + foldersInboxUnreadCount + ') ' : ' ') + email + ' - '
: ''
@ -61,7 +61,7 @@ class MailBoxUserScreen extends AbstractScreen {
AppStore.focusedState(Focused.None);
AppStore.focusedState(Focused.MessageList);
if (Settings.appSettingsGet('mobile')) {
if (Settings.app('mobile')) {
leftPanelDisabled(true);
}
@ -122,7 +122,7 @@ class MailBoxUserScreen extends AbstractScreen {
* @returns {void}
*/
onBuild() {
if (!bMobileDevice && !Settings.appSettingsGet('mobile')) {
if (!bMobileDevice && !Settings.app('mobile')) {
setTimeout(() =>
getApp().initHorizontalLayoutResizer(ClientSideKeyName.MessageListSize)
, 1);

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

@ -6,7 +6,6 @@ import { initOnStartOrLangChange, i18n } from 'Common/Translator';
import AppStore from 'Stores/User/App';
import AccountStore from 'Stores/User/Account';
import * as Settings from 'Storage/Settings';
import { addSettingsViewModel } from 'Knoin/Knoin';
import { AbstractSettingsScreen } from 'Screen/AbstractSettings';
@ -25,7 +24,7 @@ import { SystemDropDownSettingsUserView } from 'View/User/Settings/SystemDropDow
import { MenuSettingsUserView } from 'View/User/Settings/Menu';
import { PaneSettingsUserView } from 'View/User/Settings/Pane';
import { getApp } from 'Helper/Apps/User';
const Settings = rl.settings;
class SettingsUserScreen extends AbstractSettingsScreen {
constructor() {
@ -113,14 +112,14 @@ class SettingsUserScreen extends AbstractSettingsScreen {
keyScope(KeyState.Settings);
leftPanelType('');
if (Settings.appSettingsGet('mobile')) {
if (Settings.app('mobile')) {
leftPanelDisabled(true);
}
}
setSettingsTitle() {
const sEmail = AccountStore.email();
getApp().setWindowTitle((sEmail ? sEmail + ' - ' : '') + this.sSettingsTitle);
rl.setWindowTitle((sEmail ? sEmail + ' - ' : '') + this.sSettingsTitle);
}
}