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

Code refactoring (3) (es5 -> es2015)

Browse source
This commit is contained in:
RainLoop Team 2016-07-08 02:22:58 +03:00
parent 739ed215ea
commit e49f3c6692
11 changed files with 619 additions and 571 deletions
Download patch file Download diff file Expand all files Collapse all files

39
dev/App/User.jsx
View file

@ -57,7 +57,10 @@ import {LoginUserScreen} from 'Screen/User/Login';
import {MailBoxUserScreen} from 'Screen/User/MailBox';
import {SettingsUserScreen} from 'Screen/User/Settings';
import kn from 'Knoin/Knoin';
import {
hideLoading, routeOff, routeOn, setHash,
startScreens, showScreenPopup
} from 'Knoin/Knoin';
import {AbstractApp} from 'App/Abstract';
@ -166,7 +169,7 @@ class AppUser extends AbstractApp
MessageStore.messageListPageBeforeThread(1);
iOffset = 0;
kn.setHash(Links.mailBox(
setHash(Links.mailBox(
FolderStore.currentFolderFullNameHash(),
MessageStore.messageListPage(),
MessageStore.messageListSearch(),
@ -364,12 +367,12 @@ class AppUser extends AbstractApp
if (!oMoveFolder && bUseFolder)
{
kn.showScreenPopup(require('View/Popup/FolderSystem'), [nSetSystemFoldersNotification]);
showScreenPopup(require('View/Popup/FolderSystem'), [nSetSystemFoldersNotification]);
}
else if (!bUseFolder || (FolderType.Trash === iDeleteType &&
(sFromFolderFullNameRaw === FolderStore.spamFolder() || sFromFolderFullNameRaw === FolderStore.trashFolder())))
{
kn.showScreenPopup(require('View/Popup/Ask'), [i18n('POPUPS_ASK/DESC_WANT_DELETE_MESSAGES'), () => {
showScreenPopup(require('View/Popup/Ask'), [i18n('POPUPS_ASK/DESC_WANT_DELETE_MESSAGES'), () => {
this.messagesDeleteHelper(sFromFolderFullNameRaw, aUidForRemove);
MessageStore.removeMessagesFromList(sFromFolderFullNameRaw, aUidForRemove);
}]);
@ -1200,11 +1203,11 @@ class AppUser extends AbstractApp
}
bootstartTwoFactorScreen() {
kn.showScreenPopup(require('View/Popup/TwoFactorConfiguration'), [true]);
showScreenPopup(require('View/Popup/TwoFactorConfiguration'), [true]);
}
bootstartWelcomePopup(url) {
kn.showScreenPopup(require('View/Popup/WelcomePage'), [url]);
showScreenPopup(require('View/Popup/WelcomePage'), [url]);
}
bootstartLoginScreen() {
@ -1214,7 +1217,7 @@ class AppUser extends AbstractApp
const customLoginLink = pString(Settings.appSettingsGet('customLoginLink'));
if (!customLoginLink)
{
kn.startScreens([
startScreens([
LoginUserScreen
]);
@ -1223,9 +1226,9 @@ class AppUser extends AbstractApp
}
else
{
kn.routeOff();
kn.setHash(Links.root(), true);
kn.routeOff();
routeOff();
setHash(Links.root(), true);
routeOff();
_.defer(function() {
window.location.href = customLoginLink;
@ -1236,14 +1239,9 @@ class AppUser extends AbstractApp
bootend() {
if (progressJs)
{
kn.hideLoading();
progressJs.set(100).end();
}
else
{
kn.hideLoading();
}
hideLoading();
}
bootstart() {
@ -1299,9 +1297,9 @@ class AppUser extends AbstractApp
{
if ('' !== sStartupUrl)
{
kn.routeOff();
kn.setHash(Links.root(sStartupUrl), true);
kn.routeOn();
routeOff();
setHash(Links.root(sStartupUrl), true);
routeOn();
}
if (window.jassl && window.crypto && window.crypto.getRandomValues && Settings.capa(Capa.OpenPGP))
@ -1349,7 +1347,7 @@ class AppUser extends AbstractApp
PgpStore.capaOpenPGP(false);
}
kn.startScreens([
startScreens([
MailBoxUserScreen,
Settings.capa(Capa.Settings) ? SettingsUserScreen : null
// false ? AboutUserScreen : null
@ -1442,7 +1440,6 @@ class AppUser extends AbstractApp
{
this.logout();
}
});
// }); // require code splitting