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

Code refactoring

Browse source
This commit is contained in:
RainLoop Team 2014-10-18 17:43:44 +04:00
parent 345e7c58af
commit 8cf8b94d39
103 changed files with 664 additions and 659 deletions
Download patch file Download diff file Expand all files Collapse all files

32
dev/Screen/App/About.js
View file

@ -1,32 +0,0 @@
(function () {
'use strict';
var
_ = require('_'),
AbstractScreen = require('Knoin/AbstractScreen')
;
/**
* @constructor
* @extends AbstractScreen
*/
function AboutAppScreen()
{
AbstractScreen.call(this, 'about', [
require('View/App/About')
]);
}
_.extend(AboutAppScreen.prototype, AbstractScreen.prototype);
AboutAppScreen.prototype.onShow = function ()
{
require('App/App').setTitle('RainLoop');
};
module.exports = AboutAppScreen;
}());

32
dev/Screen/App/Login.js
View file

@ -1,32 +0,0 @@
(function () {
'use strict';
var
_ = require('_'),
AbstractScreen = require('Knoin/AbstractScreen')
;
/**
* @constructor
* @extends AbstractScreen
*/
function LoginAppScreen()
{
AbstractScreen.call(this, 'login', [
require('View/App/Login')
]);
}
_.extend(LoginAppScreen.prototype, AbstractScreen.prototype);
LoginAppScreen.prototype.onShow = function ()
{
require('App/App').setTitle('');
};
module.exports = LoginAppScreen;
}());

32
dev/Screen/User/About.js Normal file
View file

@ -0,0 +1,32 @@
(function () {
'use strict';
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').setTitle('RainLoop');
};
module.exports = AboutUserScreen;
}());

32
dev/Screen/User/Login.js Normal file
View file

@ -0,0 +1,32 @@
(function () {
'use strict';
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').setTitle('');
};
module.exports = LoginUserScreen;
}());

44
dev/Screen/App/MailBox.js → dev/Screen/User/MailBox.js
View file

@ -12,9 +12,9 @@
Events = require('Common/Events'),
Settings = require('Storage/Settings'),
Data = require('Storage/App/Data'),
Cache = require('Storage/App/Cache'),
Remote = require('Storage/App/Remote'),
Data = require('Storage/User/Data'),
Cache = require('Storage/User/Cache'),
Remote = require('Storage/User/Remote'),
AbstractScreen = require('Knoin/AbstractScreen')
;
@ -23,37 +23,37 @@
* @constructor
* @extends AbstractScreen
*/
function MailBoxAppScreen()
function MailBoxUserScreen()
{
AbstractScreen.call(this, 'mailbox', [
require('View/App/MailBox/SystemDropDown'),
require('View/App/MailBox/FolderList'),
require('View/App/MailBox/MessageList'),
require('View/App/MailBox/MessageView')
require('View/User/MailBox/SystemDropDown'),
require('View/User/MailBox/FolderList'),
require('View/User/MailBox/MessageList'),
require('View/User/MailBox/MessageView')
]);
this.oLastRoute = {};
}
_.extend(MailBoxAppScreen.prototype, AbstractScreen.prototype);
_.extend(MailBoxUserScreen.prototype, AbstractScreen.prototype);
/**
* @type {Object}
*/
MailBoxAppScreen.prototype.oLastRoute = {};
MailBoxUserScreen.prototype.oLastRoute = {};
MailBoxAppScreen.prototype.setNewTitle = function ()
MailBoxUserScreen.prototype.setNewTitle = function ()
{
var
sEmail = Data.accountEmail(),
nFoldersInboxUnreadCount = Data.foldersInboxUnreadCount()
;
require('App/App').setTitle(('' === sEmail ? '' :
require('App/User').setTitle(('' === sEmail ? '' :
(0 < nFoldersInboxUnreadCount ? '(' + nFoldersInboxUnreadCount + ') ' : ' ') + sEmail + ' - ') + Utils.i18n('TITLES/MAILBOX'));
};
MailBoxAppScreen.prototype.onShow = function ()
MailBoxUserScreen.prototype.onShow = function ()
{
this.setNewTitle();
Globals.keyScope(Enums.KeyState.MessageList);
@ -65,13 +65,13 @@
* @param {string} sSearch
* @param {boolean=} bPreview = false
*/
MailBoxAppScreen.prototype.onRoute = function (sFolderHash, iPage, sSearch, bPreview)
MailBoxUserScreen.prototype.onRoute = function (sFolderHash, iPage, sSearch, bPreview)
{
if (Utils.isUnd(bPreview) ? false : !!bPreview)
{
if (Enums.Layout.NoPreview === Data.layout() && !Data.message())
{
require('App/App').historyBack();
require('App/User').historyBack();
}
}
else
@ -94,12 +94,12 @@
Data.message(null);
}
require('App/App').reloadMessageList();
require('App/User').reloadMessageList();
}
}
};
MailBoxAppScreen.prototype.onStart = function ()
MailBoxUserScreen.prototype.onStart = function ()
{
var
sInboxFolderName = Cache.getFolderInboxName(),
@ -110,18 +110,18 @@
if (Settings.capa(Enums.Capa.AdditionalAccounts) || Settings.capa(Enums.Capa.AdditionalIdentities))
{
require('App/App').accountsAndIdentities();
require('App/User').accountsAndIdentities();
}
_.delay(function () {
if (sInboxFolderName !== Data.currentFolderFullNameRaw())
{
require('App/App').folderInformation(sInboxFolderName);
require('App/User').folderInformation(sInboxFolderName);
}
}, 1000);
_.delay(function () {
require('App/App').quota();
require('App/User').quota();
}, 5000);
_.delay(function () {
@ -150,7 +150,7 @@
/**
* @return {Array}
*/
MailBoxAppScreen.prototype.routes = function ()
MailBoxUserScreen.prototype.routes = function ()
{
var
sInboxFolderName = Cache.getFolderInboxName(),
@ -193,6 +193,6 @@
];
};
module.exports = MailBoxAppScreen;
module.exports = MailBoxUserScreen;
}());

44
dev/Screen/App/Settings.js → dev/Screen/User/Settings.js
View file

@ -21,12 +21,12 @@
* @constructor
* @extends AbstractSettingsScreen
*/
function SettingsAppScreen()
function SettingsUserScreen()
{
AbstractSettingsScreen.call(this, [
require('View/App/Settings/SystemDropDown'),
require('View/App/Settings/Menu'),
require('View/App/Settings/Pane')
require('View/User/Settings/SystemDropDown'),
require('View/User/Settings/Menu'),
require('View/User/Settings/Pane')
]);
Utils.initOnStartOrLangChange(function () {
@ -36,48 +36,48 @@
});
}
_.extend(SettingsAppScreen.prototype, AbstractSettingsScreen.prototype);
_.extend(SettingsUserScreen.prototype, AbstractSettingsScreen.prototype);
/**
* @param {Function=} fCallback
*/
SettingsAppScreen.prototype.setupSettings = function (fCallback)
SettingsUserScreen.prototype.setupSettings = function (fCallback)
{
kn.addSettingsViewModel(require('Settings/App/General'),
kn.addSettingsViewModel(require('Settings/User/General'),
'SettingsGeneral', 'SETTINGS_LABELS/LABEL_GENERAL_NAME', 'general', true);
if (Settings.settingsGet('ContactsIsAllowed'))
{
kn.addSettingsViewModel(require('Settings/App/Contacts'),
kn.addSettingsViewModel(require('Settings/User/Contacts'),
'SettingsContacts', 'SETTINGS_LABELS/LABEL_CONTACTS_NAME', 'contacts');
}
if (Settings.capa(Enums.Capa.AdditionalAccounts))
{
kn.addSettingsViewModel(require('Settings/App/Accounts'),
kn.addSettingsViewModel(require('Settings/User/Accounts'),
'SettingsAccounts', 'SETTINGS_LABELS/LABEL_ACCOUNTS_NAME', 'accounts');
}
if (Settings.capa(Enums.Capa.AdditionalIdentities))
{
kn.addSettingsViewModel(require('Settings/App/Identities'),
kn.addSettingsViewModel(require('Settings/User/Identities'),
'SettingsIdentities', 'SETTINGS_LABELS/LABEL_IDENTITIES_NAME', 'identities');
}
else
{
kn.addSettingsViewModel(require('Settings/App/Identity'),
kn.addSettingsViewModel(require('Settings/User/Identity'),
'SettingsIdentity', 'SETTINGS_LABELS/LABEL_IDENTITY_NAME', 'identity');
}
if (Settings.capa(Enums.Capa.Filters))
{
kn.addSettingsViewModel(require('Settings/App/Filters'),
kn.addSettingsViewModel(require('Settings/User/Filters'),
'SettingsFilters', 'SETTINGS_LABELS/LABEL_FILTERS_NAME', 'filters');
}
if (Settings.capa(Enums.Capa.TwoFactor))
{
kn.addSettingsViewModel(require('Settings/App/Security'),
kn.addSettingsViewModel(require('Settings/User/Security'),
'SettingsSecurity', 'SETTINGS_LABELS/LABEL_SECURITY_NAME', 'security');
}
@ -85,28 +85,28 @@
Settings.settingsGet('AllowFacebookSocial') ||
Settings.settingsGet('AllowTwitterSocial'))
{
kn.addSettingsViewModel(require('Settings/App/Social'),
kn.addSettingsViewModel(require('Settings/User/Social'),
'SettingsSocial', 'SETTINGS_LABELS/LABEL_SOCIAL_NAME', 'social');
}
if (Settings.settingsGet('ChangePasswordIsAllowed'))
{
kn.addSettingsViewModel(require('Settings/App/ChangePassword'),
kn.addSettingsViewModel(require('Settings/User/ChangePassword'),
'SettingsChangePassword', 'SETTINGS_LABELS/LABEL_CHANGE_PASSWORD_NAME', 'change-password');
}
kn.addSettingsViewModel(require('Settings/App/Folders'),
kn.addSettingsViewModel(require('Settings/User/Folders'),
'SettingsFolders', 'SETTINGS_LABELS/LABEL_FOLDERS_NAME', 'folders');
if (Settings.capa(Enums.Capa.Themes))
{
kn.addSettingsViewModel(require('Settings/App/Themes'),
kn.addSettingsViewModel(require('Settings/User/Themes'),
'SettingsThemes', 'SETTINGS_LABELS/LABEL_THEMES_NAME', 'themes');
}
if (Settings.capa(Enums.Capa.OpenPGP))
{
kn.addSettingsViewModel(require('Settings/App/OpenPGP'),
kn.addSettingsViewModel(require('Settings/User/OpenPgp'),
'SettingsOpenPGP', 'SETTINGS_LABELS/LABEL_OPEN_PGP_NAME', 'openpgp');
}
@ -116,17 +116,17 @@
}
};
SettingsAppScreen.prototype.onShow = function ()
SettingsUserScreen.prototype.onShow = function ()
{
this.setSettingsTitle();
Globals.keyScope(Enums.KeyState.Settings);
};
SettingsAppScreen.prototype.setSettingsTitle = function ()
SettingsUserScreen.prototype.setSettingsTitle = function ()
{
require('App/App').setTitle(this.sSettingsTitle);
require('App/User').setTitle(this.sSettingsTitle);
};
module.exports = SettingsAppScreen;
module.exports = SettingsUserScreen;
}());