Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-08-30 12:39: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

25
dev/Screen/User/About.js
View file

@ -1,25 +0,0 @@
var
_ = require('_'),
AbstractScreen = require('Knoin/AbstractScreen');
/**
* @constructor
* @extends AbstractScreen
*/
function AboutUserScreen()
{
AbstractScreen.call(this, 'about', [
require('View/User/About')
]);
}
_.extend(AboutUserScreen.prototype, AbstractScreen.prototype);
AboutUserScreen.prototype.onShow = function()
{
require('App/User').default.setWindowTitle('RainLoop');
};
module.exports = AboutUserScreen;

19
dev/Screen/User/About.jsx Normal file
View file

@ -0,0 +1,19 @@
import {AbstractScreen} from 'Knoin/AbstractScreen';
import App from 'App/User';
class AboutUserScreen extends AbstractScreen
{
constructor()
{
super('about', [
require('View/User/About')
]);
}
onShow() {
App.setWindowTitle('RainLoop');
}
}
export {AboutUserScreen, AboutUserScreen as default};

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

@ -1,25 +0,0 @@
var
_ = require('_'),
AbstractScreen = require('Knoin/AbstractScreen');
/**
* @constructor
* @extends AbstractScreen
*/
function LoginUserScreen()
{
AbstractScreen.call(this, 'login', [
require('View/User/Login')
]);
}
_.extend(LoginUserScreen.prototype, AbstractScreen.prototype);
LoginUserScreen.prototype.onShow = function()
{
require('App/User').default.setWindowTitle('');
};
module.exports = LoginUserScreen;

19
dev/Screen/User/Login.jsx Normal file
View file

@ -0,0 +1,19 @@
import {AbstractScreen} from 'Knoin/AbstractScreen';
import App from 'App/User';
class LoginUserScreen extends AbstractScreen
{
constructor()
{
super('login', [
require('View/User/Login')
]);
}
onShow() {
App.setWindowTitle('');
}
}
export {LoginUserScreen, LoginUserScreen as default};

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

@ -1,194 +0,0 @@
var
_ = require('_'),
Enums = require('Common/Enums'),
Globals = require('Common/Globals'),
Utils = require('Common/Utils'),
Events = require('Common/Events'),
Translator = require('Common/Translator'),
Cache = require('Common/Cache'),
AppStore = require('Stores/User/App'),
AccountStore = require('Stores/User/Account'),
SettingsStore = require('Stores/User/Settings'),
FolderStore = require('Stores/User/Folder'),
MessageStore = require('Stores/User/Message'),
Settings = require('Storage/Settings'),
AbstractScreen = require('Knoin/AbstractScreen');
/**
* @constructor
* @extends AbstractScreen
*/
function MailBoxUserScreen()
{
AbstractScreen.call(this, 'mailbox', [
require('View/User/MailBox/SystemDropDown'),
require('View/User/MailBox/FolderList'),
require('View/User/MailBox/MessageList'),
require('View/User/MailBox/MessageView')
]);
this.oLastRoute = {};
}
_.extend(MailBoxUserScreen.prototype, AbstractScreen.prototype);
/**
* @type {Object}
*/
MailBoxUserScreen.prototype.oLastRoute = {};
MailBoxUserScreen.prototype.updateWindowTitle = function()
{
var
sEmail = AccountStore.email(),
nFoldersInboxUnreadCount = FolderStore.foldersInboxUnreadCount();
if (Settings.appSettingsGet('listPermanentFiltered'))
{
nFoldersInboxUnreadCount = 0;
}
require('App/User').default.setWindowTitle(('' === sEmail ? '' : '' +
(0 < nFoldersInboxUnreadCount ? '(' + nFoldersInboxUnreadCount + ') ' : ' ') +
sEmail + ' - ') + Translator.i18n('TITLES/MAILBOX'));
};
MailBoxUserScreen.prototype.onShow = function()
{
this.updateWindowTitle();
AppStore.focusedState(Enums.Focused.None);
AppStore.focusedState(Enums.Focused.MessageList);
if (Settings.appSettingsGet('mobile'))
{
Globals.leftPanelDisabled(true);
}
if (!Settings.capa(Enums.Capa.Folders))
{
Globals.leftPanelType(
Settings.capa(Enums.Capa.Composer) || Settings.capa(Enums.Capa.Contacts) ? 'short' : 'none');
}
else
{
Globals.leftPanelType('');
}
};
/**
* @param {string} sFolderHash
* @param {number} iPage
* @param {string} sSearch
*/
MailBoxUserScreen.prototype.onRoute = function(sFolderHash, iPage, sSearch)
{
var
sThreadUid = sFolderHash.replace(/^(.+)~([\d]+)$/, '$2'),
oFolder = Cache.getFolderFromCacheList(Cache.getFolderFullNameRaw(
sFolderHash.replace(/~([\d]+)$/, '')));
if (oFolder)
{
if (sFolderHash === sThreadUid)
{
sThreadUid = '';
}
FolderStore.currentFolder(oFolder);
MessageStore.messageListPage(iPage);
MessageStore.messageListSearch(sSearch);
MessageStore.messageListThreadUid(sThreadUid);
require('App/User').default.reloadMessageList();
}
};
MailBoxUserScreen.prototype.onStart = function()
{
FolderStore.folderList.subscribe(Utils.windowResizeCallback);
MessageStore.messageList.subscribe(Utils.windowResizeCallback);
MessageStore.message.subscribe(Utils.windowResizeCallback);
_.delay(function() {
SettingsStore.layout.valueHasMutated();
}, 50);
Events.sub('mailbox.inbox-unread-count', _.bind(function(iCount) {
FolderStore.foldersInboxUnreadCount(iCount);
var sEmail = AccountStore.email();
_.each(AccountStore.accounts(), function(oItem) {
if (oItem && sEmail === oItem.email)
{
oItem.count(iCount);
}
});
this.updateWindowTitle();
}, this));
};
MailBoxUserScreen.prototype.onBuild = function()
{
if (!Globals.bMobileDevice && !Settings.appSettingsGet('mobile'))
{
_.defer(function() {
require('App/User').default.initHorizontalLayoutResizer(Enums.ClientSideKeyName.MessageListSize);
});
}
};
/**
* @returns {Array}
*/
MailBoxUserScreen.prototype.routes = function()
{
var
sInboxFolderName = Cache.getFolderInboxName(),
fNormS = function(oRequest, oVals) {
oVals[0] = Utils.pString(oVals[0]);
oVals[1] = Utils.pInt(oVals[1]);
oVals[1] = 0 >= oVals[1] ? 1 : oVals[1];
oVals[2] = Utils.pString(oVals[2]);
if ('' === oRequest)
{
oVals[0] = sInboxFolderName;
oVals[1] = 1;
}
return [decodeURI(oVals[0]), oVals[1], decodeURI(oVals[2])];
},
fNormD = function(oRequest, oVals) {
oVals[0] = Utils.pString(oVals[0]);
oVals[1] = Utils.pString(oVals[1]);
if ('' === oRequest)
{
oVals[0] = sInboxFolderName;
}
return [decodeURI(oVals[0]), 1, decodeURI(oVals[1])];
};
return [
[/^([a-zA-Z0-9~]+)\/p([1-9][0-9]*)\/(.+)\/?$/, {'normalize_': fNormS}],
[/^([a-zA-Z0-9~]+)\/p([1-9][0-9]*)$/, {'normalize_': fNormS}],
[/^([a-zA-Z0-9~]+)\/(.+)\/?$/, {'normalize_': fNormD}],
[/^([^\/]*)$/, {'normalize_': fNormS}]
];
};
module.exports = MailBoxUserScreen;

180
dev/Screen/User/MailBox.jsx Normal file
View file

@ -0,0 +1,180 @@
import _ from '_';
import {Focused, Capa, ClientSideKeyName, Magics} from 'Common/Enums';
import {leftPanelDisabled, leftPanelType, bMobileDevice} from 'Common/Globals';
import {pString, pInt, decodeURI, windowResizeCallback} from 'Common/Utils';
import {getFolderFromCacheList, getFolderFullNameRaw, getFolderInboxName} from 'Common/Cache';
import {i18n} from 'Common/Translator';
import * as Events from 'Common/Events';
import * as Settings from 'Storage/Settings';
import AppStore from 'Stores/User/App';
import AccountStore from 'Stores/User/Account';
import SettingsStore from 'Stores/User/Settings';
import FolderStore from 'Stores/User/Folder';
import MessageStore from 'Stores/User/Message';
import {AbstractScreen} from 'Knoin/AbstractScreen';
import App from 'App/User';
class MailBoxUserScreen extends AbstractScreen
{
constructor()
{
super('mailbox', [
require('View/User/MailBox/SystemDropDown'),
require('View/User/MailBox/FolderList'),
require('View/User/MailBox/MessageList'),
require('View/User/MailBox/MessageView')
]);
}
/**
* @returns {void}
*/
updateWindowTitle() {
let foldersInboxUnreadCount = FolderStore.foldersInboxUnreadCount();
const email = AccountStore.email();
if (Settings.appSettingsGet('listPermanentFiltered'))
{
foldersInboxUnreadCount = 0;
}
App.setWindowTitle(('' === email ? '' : '' + (0 < foldersInboxUnreadCount ? '(' + foldersInboxUnreadCount + ') ' : ' ') + email + ' - ') + i18n('TITLES/MAILBOX'));
}
/**
* @returns {void}
*/
onShow() {
this.updateWindowTitle();
AppStore.focusedState(Focused.None);
AppStore.focusedState(Focused.MessageList);
if (Settings.appSettingsGet('mobile'))
{
leftPanelDisabled(true);
}
if (!Settings.capa(Capa.Folders))
{
leftPanelType(Settings.capa(Capa.Composer) || Settings.capa(Capa.Contacts) ? 'short' : 'none');
}
else
{
leftPanelType('');
}
}
/**
* @param {string} folderHash
* @param {number} page
* @param {string} search
*/
onRoute(folderHash, page, search) {
let threadUid = folderHash.replace(/^(.+)~([\d]+)$/, '$2');
const folder = getFolderFromCacheList(getFolderFullNameRaw(folderHash.replace(/~([\d]+)$/, '')));
if (folder)
{
if (folderHash === threadUid)
{
threadUid = '';
}
FolderStore.currentFolder(folder);
MessageStore.messageListPage(page);
MessageStore.messageListSearch(search);
MessageStore.messageListThreadUid(threadUid);
App.reloadMessageList();
}
}
/**
* @returns {void}
*/
onStart() {
FolderStore.folderList.subscribe(windowResizeCallback);
MessageStore.messageList.subscribe(windowResizeCallback);
MessageStore.message.subscribe(windowResizeCallback);
_.delay(() => {
SettingsStore.layout.valueHasMutated();
}, Magics.Time50ms);
Events.sub('mailbox.inbox-unread-count', (count) => {
FolderStore.foldersInboxUnreadCount(count);
const email = AccountStore.email();
_.each(AccountStore.accounts(), (item) => {
if (item && email === item.email)
{
item.count(count);
}
});
this.updateWindowTitle();
});
}
/**
* @returns {void}
*/
onBuild() {
if (!bMobileDevice && !Settings.appSettingsGet('mobile'))
{
_.defer(() => {
App.initHorizontalLayoutResizer(ClientSideKeyName.MessageListSize);
});
}
}
/**
* @returns {Array}
*/
routes() {
var
inboxFolderName = getFolderInboxName(),
fNormS = (request, vals) => {
vals[0] = pString(vals[0]);
vals[1] = pInt(vals[1]);
vals[1] = 0 >= vals[1] ? 1 : vals[1];
vals[2] = pString(vals[2]);
if ('' === request)
{
vals[0] = inboxFolderName;
vals[1] = 1;
}
return [decodeURI(vals[0]), vals[1], decodeURI(vals[2])];
},
fNormD = (request, vals) => {
vals[0] = pString(vals[0]);
vals[1] = pString(vals[1]);
if ('' === request)
{
vals[0] = inboxFolderName;
}
return [decodeURI(vals[0]), 1, decodeURI(vals[1])];
};
return [
[/^([a-zA-Z0-9~]+)\/p([1-9][0-9]*)\/(.+)\/?$/, {'normalize_': fNormS}],
[/^([a-zA-Z0-9~]+)\/p([1-9][0-9]*)$/, {'normalize_': fNormS}],
[/^([a-zA-Z0-9~]+)\/(.+)\/?$/, {'normalize_': fNormD}],
[/^([^\/]*)$/, {'normalize_': fNormS}]
];
}
}
export {MailBoxUserScreen, MailBoxUserScreen as default};

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

@ -1,150 +0,0 @@
var
_ = require('_'),
Enums = require('Common/Enums'),
Globals = require('Common/Globals'),
Translator = require('Common/Translator'),
Plugins = require('Common/Plugins'),
AppStore = require('Stores/User/App'),
AccountStore = require('Stores/User/Account'),
Settings = require('Storage/Settings'),
kn = require('Knoin/Knoin'),
AbstractSettingsScreen = require('Screen/AbstractSettings');
/**
* @constructor
* @extends AbstractSettingsScreen
*/
function SettingsUserScreen()
{
AbstractSettingsScreen.call(this, [
require('View/User/Settings/SystemDropDown'),
require('View/User/Settings/Menu'),
require('View/User/Settings/Pane')
]);
Translator.initOnStartOrLangChange(function() {
this.sSettingsTitle = Translator.i18n('TITLES/SETTINGS');
}, this, function() {
this.setSettingsTitle();
});
}
_.extend(SettingsUserScreen.prototype, AbstractSettingsScreen.prototype);
/**
* @param {Function=} fCallback
*/
SettingsUserScreen.prototype.setupSettings = function(fCallback)
{
if (!Settings.capa(Enums.Capa.Settings))
{
if (fCallback)
{
fCallback();
}
return false;
}
kn.addSettingsViewModel(require('Settings/User/General'),
'SettingsGeneral', 'SETTINGS_LABELS/LABEL_GENERAL_NAME', 'general', true);
if (AppStore.contactsIsAllowed())
{
kn.addSettingsViewModel(require('Settings/User/Contacts'),
'SettingsContacts', 'SETTINGS_LABELS/LABEL_CONTACTS_NAME', 'contacts');
}
if (Settings.capa(Enums.Capa.AdditionalAccounts) || Settings.capa(Enums.Capa.Identities))
{
kn.addSettingsViewModel(require('Settings/User/Accounts'), 'SettingsAccounts',
Settings.capa(Enums.Capa.AdditionalAccounts) ?
'SETTINGS_LABELS/LABEL_ACCOUNTS_NAME' : 'SETTINGS_LABELS/LABEL_IDENTITIES_NAME', 'accounts');
}
if (Settings.capa(Enums.Capa.Sieve))
{
kn.addSettingsViewModel(require('Settings/User/Filters'),
'SettingsFilters', 'SETTINGS_LABELS/LABEL_FILTERS_NAME', 'filters');
}
if (Settings.capa(Enums.Capa.AutoLogout) || Settings.capa(Enums.Capa.TwoFactor))
{
kn.addSettingsViewModel(require('Settings/User/Security'),
'SettingsSecurity', 'SETTINGS_LABELS/LABEL_SECURITY_NAME', 'security');
}
if (AccountStore.isRootAccount() && (
(Settings.settingsGet('AllowGoogleSocial') && Settings.settingsGet('AllowGoogleSocialAuth')) ||
Settings.settingsGet('AllowFacebookSocial') ||
Settings.settingsGet('AllowTwitterSocial')))
{
kn.addSettingsViewModel(require('Settings/User/Social'),
'SettingsSocial', 'SETTINGS_LABELS/LABEL_SOCIAL_NAME', 'social');
}
if (Settings.settingsGet('ChangePasswordIsAllowed'))
{
kn.addSettingsViewModel(require('Settings/User/ChangePassword'),
'SettingsChangePassword', 'SETTINGS_LABELS/LABEL_CHANGE_PASSWORD_NAME', 'change-password');
}
if (Settings.capa(Enums.Capa.Templates))
{
kn.addSettingsViewModel(require('Settings/User/Templates'),
'SettingsTemplates', 'SETTINGS_LABELS/LABEL_TEMPLATES_NAME', 'templates');
}
if (Settings.capa(Enums.Capa.Folders))
{
kn.addSettingsViewModel(require('Settings/User/Folders'),
'SettingsFolders', 'SETTINGS_LABELS/LABEL_FOLDERS_NAME', 'folders');
}
if (Settings.capa(Enums.Capa.Themes))
{
kn.addSettingsViewModel(require('Settings/User/Themes'),
'SettingsThemes', 'SETTINGS_LABELS/LABEL_THEMES_NAME', 'themes');
}
if (Settings.capa(Enums.Capa.OpenPGP))
{
kn.addSettingsViewModel(require('Settings/User/OpenPgp'),
'SettingsOpenPGP', 'SETTINGS_LABELS/LABEL_OPEN_PGP_NAME', 'openpgp');
}
Plugins.runSettingsViewModelHooks(false);
if (fCallback)
{
fCallback();
}
return true;
};
SettingsUserScreen.prototype.onShow = function()
{
this.setSettingsTitle();
Globals.keyScope(Enums.KeyState.Settings);
Globals.leftPanelType('');
if (Settings.appSettingsGet('mobile'))
{
Globals.leftPanelDisabled(true);
}
};
SettingsUserScreen.prototype.setSettingsTitle = function()
{
var sEmail = AccountStore.email();
require('App/User').default.setWindowTitle(('' === sEmail ? '' : sEmail + ' - ') + this.sSettingsTitle);
};
module.exports = SettingsUserScreen;

141
dev/Screen/User/Settings.jsx Normal file
View file

@ -0,0 +1,141 @@
import {Capa, KeyState} from 'Common/Enums';
import {keyScope, leftPanelType, leftPanelDisabled} from 'Common/Globals';
import {runSettingsViewModelHooks} from 'Common/Plugins';
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 kn from 'Knoin/Knoin';
import {AbstractSettingsScreen} from 'Screen/AbstractSettings';
import App from 'App/User';
class SettingsUserScreen extends AbstractSettingsScreen
{
constructor()
{
super([
require('View/User/Settings/SystemDropDown'),
require('View/User/Settings/Menu'),
require('View/User/Settings/Pane')
]);
initOnStartOrLangChange(() => {
this.sSettingsTitle = i18n('TITLES/SETTINGS');
}, () => {
this.setSettingsTitle();
});
}
/**
* @param {Function=} fCallback
*/
setupSettings(fCallback = null) {
if (!Settings.capa(Capa.Settings))
{
if (fCallback)
{
fCallback();
}
return false;
}
kn.addSettingsViewModel(require('Settings/User/General'),
'SettingsGeneral', 'SETTINGS_LABELS/LABEL_GENERAL_NAME', 'general', true);
if (AppStore.contactsIsAllowed())
{
kn.addSettingsViewModel(require('Settings/User/Contacts'),
'SettingsContacts', 'SETTINGS_LABELS/LABEL_CONTACTS_NAME', 'contacts');
}
if (Settings.capa(Capa.AdditionalAccounts) || Settings.capa(Capa.Identities))
{
kn.addSettingsViewModel(require('Settings/User/Accounts'), 'SettingsAccounts',
Settings.capa(Capa.AdditionalAccounts) ? 'SETTINGS_LABELS/LABEL_ACCOUNTS_NAME' : 'SETTINGS_LABELS/LABEL_IDENTITIES_NAME', 'accounts');
}
if (Settings.capa(Capa.Sieve))
{
kn.addSettingsViewModel(require('Settings/User/Filters'),
'SettingsFilters', 'SETTINGS_LABELS/LABEL_FILTERS_NAME', 'filters');
}
if (Settings.capa(Capa.AutoLogout) || Settings.capa(Capa.TwoFactor))
{
kn.addSettingsViewModel(require('Settings/User/Security'),
'SettingsSecurity', 'SETTINGS_LABELS/LABEL_SECURITY_NAME', 'security');
}
if (AccountStore.isRootAccount() && (
(Settings.settingsGet('AllowGoogleSocial') && Settings.settingsGet('AllowGoogleSocialAuth')) ||
Settings.settingsGet('AllowFacebookSocial') ||
Settings.settingsGet('AllowTwitterSocial')))
{
kn.addSettingsViewModel(require('Settings/User/Social'),
'SettingsSocial', 'SETTINGS_LABELS/LABEL_SOCIAL_NAME', 'social');
}
if (Settings.settingsGet('ChangePasswordIsAllowed'))
{
kn.addSettingsViewModel(require('Settings/User/ChangePassword'),
'SettingsChangePassword', 'SETTINGS_LABELS/LABEL_CHANGE_PASSWORD_NAME', 'change-password');
}
if (Settings.capa(Capa.Templates))
{
kn.addSettingsViewModel(require('Settings/User/Templates'),
'SettingsTemplates', 'SETTINGS_LABELS/LABEL_TEMPLATES_NAME', 'templates');
}
if (Settings.capa(Capa.Folders))
{
kn.addSettingsViewModel(require('Settings/User/Folders'),
'SettingsFolders', 'SETTINGS_LABELS/LABEL_FOLDERS_NAME', 'folders');
}
if (Settings.capa(Capa.Themes))
{
kn.addSettingsViewModel(require('Settings/User/Themes'),
'SettingsThemes', 'SETTINGS_LABELS/LABEL_THEMES_NAME', 'themes');
}
if (Settings.capa(Capa.OpenPGP))
{
kn.addSettingsViewModel(require('Settings/User/OpenPgp'),
'SettingsOpenPGP', 'SETTINGS_LABELS/LABEL_OPEN_PGP_NAME', 'openpgp');
}
runSettingsViewModelHooks(false);
if (fCallback)
{
fCallback();
}
return true;
}
onShow() {
this.setSettingsTitle();
keyScope(KeyState.Settings);
leftPanelType('');
if (Settings.appSettingsGet('mobile'))
{
leftPanelDisabled(true);
}
}
setSettingsTitle() {
const sEmail = AccountStore.email();
App.setWindowTitle(('' === sEmail ? '' : sEmail + ' - ') + this.sSettingsTitle);
}
}
export {SettingsUserScreen, SettingsUserScreen as default};