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

Code refactoring (2) (es5 -> es2015)

Browse source
This commit is contained in:
RainLoop Team 2016-07-07 02:11:13 +03:00
parent 38a1041a73
commit a2308e251b
23 changed files with 760 additions and 821 deletions
Download patch file Download diff file Expand all files Collapse all files

7
dev/App/Admin.jsx
View file

@ -19,6 +19,9 @@ import PackageStore from 'Stores/Admin/Package';
import CoreStore from 'Stores/Admin/Core';
import Remote from 'Remote/Admin/Ajax';
import {SettingsAdminScreen} from 'Screen/Admin/Settings';
import {LoginAdminScreen} from 'Screen/Admin/Login';
import kn from 'Knoin/Knoin';
import {AbstractApp} from 'App/Abstract';
@ -236,13 +239,13 @@ class AdminApp extends AbstractApp
if (Settings.settingsGet('Auth'))
{
kn.startScreens([
require('Screen/Admin/Settings')
SettingsAdminScreen
]);
}
else
{
kn.startScreens([
require('Screen/Admin/Login')
LoginAdminScreen
]);
}
}

13
dev/App/User.jsx
View file

@ -52,6 +52,11 @@ import {IdentityModel} from 'Model/Identity';
import {TemplateModel} from 'Model/Template';
import {OpenPgpKeyModel} from 'Model/OpenPgpKey';
// import {AboutUserScreen} from 'Screen/User/About';
import {LoginUserScreen} from 'Screen/User/Login';
import {MailBoxUserScreen} from 'Screen/User/MailBox';
import {SettingsUserScreen} from 'Screen/User/Settings';
import kn from 'Knoin/Knoin';
import {AbstractApp} from 'App/Abstract';
@ -1210,7 +1215,7 @@ class AppUser extends AbstractApp
if (!customLoginLink)
{
kn.startScreens([
require('Screen/User/Login')
LoginUserScreen
]);
Plugins.runHook('rl-start-login-screens');
@ -1345,9 +1350,9 @@ class AppUser extends AbstractApp
}
kn.startScreens([
require('Screen/User/MailBox'),
Settings.capa(Capa.Settings) ? require('Screen/User/Settings') : null
// false ? require('Screen/User/About') : null
MailBoxUserScreen,
Settings.capa(Capa.Settings) ? SettingsUserScreen : null
// false ? AboutUserScreen : null
]);
if (bGoogle || bFacebook || bTwitter)