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

Code refactoring

Browse source
This commit is contained in:
RainLoop Team 2014-08-26 19:24:47 +04:00
parent 4a95dd6195
commit 36329110e5
81 changed files with 3474 additions and 2124 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dev/_AdminBoot.js → dev/Admin.js
View file

@ -2,5 +2,5 @@
(function (require) {
'use strict';
require('Boot')(require('./Boots/AdminApp.js'));
require('./Boot.js')(require('./Apps/AdminApp.js'));
}(require));

0
dev/Boots/AbstractApp.js → dev/Apps/AbstractApp.js
View file

22
dev/Boots/AdminApp.js → dev/Apps/AdminApp.js
View file

@ -48,40 +48,40 @@
AdminApp.prototype.setupSettings = function ()
{
kn.addSettingsViewModel(require('../Admin/AdminSettingsGeneral.js'),
kn.addSettingsViewModel(require('../Settings/Admin/AdminSettingsGeneral.js'),
'AdminSettingsGeneral', 'General', 'general', true);
kn.addSettingsViewModel(require('../Admin/AdminSettingsLogin.js'),
kn.addSettingsViewModel(require('../Settings/Admin/AdminSettingsLogin.js'),
'AdminSettingsLogin', 'Login', 'login');
if (AppSettings.capa(Enums.Capa.Prem))
{
kn.addSettingsViewModel(require('../Admin/AdminSettingsBranding.js'),
kn.addSettingsViewModel(require('../Settings/Admin/AdminSettingsBranding.js'),
'AdminSettingsBranding', 'Branding', 'branding');
}
kn.addSettingsViewModel(require('../Admin/AdminSettingsContacts.js'),
kn.addSettingsViewModel(require('../Settings/Admin/AdminSettingsContacts.js'),
'AdminSettingsContacts', 'Contacts', 'contacts');
kn.addSettingsViewModel(require('../Admin/AdminSettingsDomains.js'),
kn.addSettingsViewModel(require('../Settings/Admin/AdminSettingsDomains.js'),
'AdminSettingsDomains', 'Domains', 'domains');
kn.addSettingsViewModel(require('../Admin/AdminSettingsSecurity.js'),
kn.addSettingsViewModel(require('../Settings/Admin/AdminSettingsSecurity.js'),
'AdminSettingsSecurity', 'Security', 'security');
kn.addSettingsViewModel(require('../Admin/AdminSettingsSocial.js'),
kn.addSettingsViewModel(require('../Settings/Admin/AdminSettingsSocial.js'),
'AdminSettingsSocial', 'Social', 'social');
kn.addSettingsViewModel(require('../Admin/AdminSettingsPlugins.js'),
kn.addSettingsViewModel(require('../Settings/Admin/AdminSettingsPlugins.js'),
'AdminSettingsPlugins', 'Plugins', 'plugins');
kn.addSettingsViewModel(require('../Admin/AdminSettingsPackages.js'),
kn.addSettingsViewModel(require('../Settings/Admin/AdminSettingsPackages.js'),
'AdminSettingsPackages', 'Packages', 'packages');
kn.addSettingsViewModel(require('../Admin/AdminSettingsLicensing.js'),
kn.addSettingsViewModel(require('../Settings/Admin/AdminSettingsLicensing.js'),
'AdminSettingsLicensing', 'Licensing', 'licensing');
kn.addSettingsViewModel(require('../Admin/AdminSettingsAbout.js'),
kn.addSettingsViewModel(require('../Settings/Admin/AdminSettingsAbout.js'),
'AdminSettingsAbout', 'About', 'about');
return true;

24
dev/Boots/RainLoopApp.js → dev/Apps/RainLoopApp.js
View file

@ -125,41 +125,41 @@
RainLoopApp.prototype.setupSettings = function ()
{
kn.addSettingsViewModel(require('../Settings/SettingsGeneral.js'),
kn.addSettingsViewModel(require('../Settings/App/SettingsGeneral.js'),
'SettingsGeneral', 'SETTINGS_LABELS/LABEL_GENERAL_NAME', 'general', true);
if (AppSettings.settingsGet('ContactsIsAllowed'))
{
kn.addSettingsViewModel(require('../Settings/SettingsContacts.js'),
kn.addSettingsViewModel(require('../Settings/App/SettingsContacts.js'),
'SettingsContacts', 'SETTINGS_LABELS/LABEL_CONTACTS_NAME', 'contacts');
}
if (AppSettings.capa(Enums.Capa.AdditionalAccounts))
{
kn.addSettingsViewModel(require('../Settings/SettingsAccounts.js'),
kn.addSettingsViewModel(require('../Settings/App/SettingsAccounts.js'),
'SettingsAccounts', 'SETTINGS_LABELS/LABEL_ACCOUNTS_NAME', 'accounts');
}
if (AppSettings.capa(Enums.Capa.AdditionalIdentities))
{
kn.addSettingsViewModel(require('../Settings/SettingsIdentities.js'),
kn.addSettingsViewModel(require('../Settings/App/SettingsIdentities.js'),
'SettingsIdentities', 'SETTINGS_LABELS/LABEL_IDENTITIES_NAME', 'identities');
}
else
{
kn.addSettingsViewModel(require('../Settings/SettingsIdentity.js'),
kn.addSettingsViewModel(require('../Settings/App/SettingsIdentity.js'),
'SettingsIdentity', 'SETTINGS_LABELS/LABEL_IDENTITY_NAME', 'identity');
}
if (AppSettings.capa(Enums.Capa.Filters))
{
kn.addSettingsViewModel(require('../Settings/SettingsFilters.js'),
kn.addSettingsViewModel(require('../Settings/App/SettingsFilters.js'),
'SettingsFilters', 'SETTINGS_LABELS/LABEL_FILTERS_NAME', 'filters');
}
if (AppSettings.capa(Enums.Capa.TwoFactor))
{
kn.addSettingsViewModel(require('../Settings/SettingsSecurity.js'),
kn.addSettingsViewModel(require('../Settings/App/SettingsSecurity.js'),
'SettingsSecurity', 'SETTINGS_LABELS/LABEL_SECURITY_NAME', 'security');
}
@ -167,28 +167,28 @@
AppSettings.settingsGet('AllowFacebookSocial') ||
AppSettings.settingsGet('AllowTwitterSocial'))
{
kn.addSettingsViewModel(require('../Settings/SettingsSocial.js'),
kn.addSettingsViewModel(require('../Settings/App/SettingsSocial.js'),
'SettingsSocial', 'SETTINGS_LABELS/LABEL_SOCIAL_NAME', 'social');
}
if (AppSettings.settingsGet('ChangePasswordIsAllowed'))
{
kn.addSettingsViewModel(require('../Settings/SettingsChangePassword.js'),
kn.addSettingsViewModel(require('../Settings/App/SettingsChangePassword.js'),
'SettingsChangePassword', 'SETTINGS_LABELS/LABEL_CHANGE_PASSWORD_NAME', 'change-password');
}
kn.addSettingsViewModel(require('../Settings/SettingsFolders.js'),
kn.addSettingsViewModel(require('../Settings/App/SettingsFolders.js'),
'SettingsFolders', 'SETTINGS_LABELS/LABEL_FOLDERS_NAME', 'folders');
if (AppSettings.capa(Enums.Capa.Themes))
{
kn.addSettingsViewModel(require('../Settings/SettingsThemes.js'),
kn.addSettingsViewModel(require('../Settings/App/SettingsThemes.js'),
'SettingsThemes', 'SETTINGS_LABELS/LABEL_THEMES_NAME', 'themes');
}
if (AppSettings.capa(Enums.Capa.OpenPGP))
{
kn.addSettingsViewModel(require('../Settings/SettingsOpenPGP.js'),
kn.addSettingsViewModel(require('../Settings/App/SettingsOpenPGP.js'),
'SettingsOpenPGP', 'SETTINGS_LABELS/LABEL_OPEN_PGP_NAME', 'openpgp');
}

37
dev/Boots/Boot.js → dev/Boot.js
View file

@ -4,21 +4,24 @@
'use strict';
var
window = require('window'),
_ = require('_'),
$ = require('$'),
$window = require('$window'),
$html = require('$html'),
Globals = require('Globals'),
Plugins = require('Plugins'),
Utils = require('Utils')
;
module.exports = function (App) {
Globals.__RL = App;
var
window = require('window'),
_ = require('_'),
$ = require('$'),
$window = require('$window'),
$html = require('$html'),
Globals = require('Globals'),
Plugins = require('Plugins'),
Utils = require('Utils'),
Enums = require('Enums'),
EmailModel = require('./Models/EmailModel.js')
;
Globals.__APP = App;
App.setupSettings();
@ -45,10 +48,10 @@
window['rl']['pluginSettingsGet'] = Plugins.settingsGet;
window['rl']['createCommand'] = Utils.createCommand;
window['rl']['EmailModel'] = require('../Models/EmailModel.js');
window['rl']['Enums'] = require('Enums');
window['rl']['EmailModel'] = EmailModel;
window['rl']['Enums'] = Enums;
window['__RLBOOT'] = function (fCall) {
window['__APP_BOOT'] = function (fCall) {
// boot
$(function () {
@ -69,7 +72,7 @@
fCall(false);
}
window['__RLBOOT'] = null;
window['__APP_BOOT'] = null;
});
};

2
dev/Common/Globals.js
View file

@ -112,7 +112,7 @@
/**
* @type {*}
*/
Globals.__RL = null;
Globals.__APP = null;
/**
* @type {Object}

1
dev/Common/Utils.js
View file

@ -1364,7 +1364,6 @@
};
/* jshint ignore:start */
/**
* @param {string} s
* @return {string}

2
dev/_RainLoopBoot.js → dev/RainLoop.js
View file

@ -2,5 +2,5 @@
(function (require) {
'use strict';
require('Boot')(require('./Boots/RainLoopApp.js'));
require('./Boot.js')(require('./Apps/RainLoopApp.js'));
}(require));

1
dev/Screens/AbstractSettings.js
View file

@ -77,7 +77,6 @@
oViewModelPlace = this.oViewModelPlace;
if (oViewModelPlace && 1 === oViewModelPlace.length)
{
RoutedSettingsViewModel = /** @type {?Function} */ RoutedSettingsViewModel;
oSettingsScreen = new RoutedSettingsViewModel();
oViewModelDom = $('<div></div>').addClass('rl-settings-view-model').hide();

4
dev/Screens/AdminLoginScreen.js
View file

@ -23,8 +23,8 @@
AdminLoginScreen.prototype.onShow = function ()
{
var RL = require('../Boots/AdminApp.js');
RL.setTitle('');
var App = require('../Apps/AdminApp.js');
App.setTitle('');
};
module.exports = AdminLoginScreen;

4
dev/Screens/AdminSettingsScreen.js
View file

@ -30,8 +30,8 @@
AdminSettingsScreen.prototype.onShow = function ()
{
var RL = require('../Boots/AdminApp.js');
RL.setTitle('');
var App = require('../Apps/AdminApp.js');
App.setTitle('');
};
module.exports = AdminSettingsScreen;

4
dev/Screens/LoginScreen.js
View file

@ -23,8 +23,8 @@
LoginScreen.prototype.onShow = function ()
{
var RL = require('../Boots/RainLoopApp.js');
RL.setTitle('');
var App = require('../Apps/RainLoopApp.js');
App.setTitle('');
};
module.exports = LoginScreen;

18
dev/Screens/MailBoxScreen.js
View file

@ -54,12 +54,12 @@
MailBoxScreen.prototype.setNewTitle = function ()
{
var
RL = require('../Boots/RainLoopApp.js'),
App = require('../Apps/RainLoopApp.js'),
sEmail = Data.accountEmail(),
nFoldersInboxUnreadCount = Data.foldersInboxUnreadCount()
;
RL.setTitle(('' === sEmail ? '' :
App.setTitle(('' === sEmail ? '' :
(0 < nFoldersInboxUnreadCount ? '(' + nFoldersInboxUnreadCount + ') ' : ' ') + sEmail + ' - ') + Utils.i18n('TITLES/MAILBOX'));
};
@ -77,12 +77,12 @@
*/
MailBoxScreen.prototype.onRoute = function (sFolderHash, iPage, sSearch, bPreview)
{
var RL = require('../Boots/RainLoopApp.js');
var App = require('../Apps/RainLoopApp.js');
if (Utils.isUnd(bPreview) ? false : !!bPreview)
{
if (Enums.Layout.NoPreview === Data.layout() && !Data.message())
{
RL.historyBack();
App.historyBack();
}
}
else
@ -105,7 +105,7 @@
Data.message(null);
}
RL.reloadMessageList();
App.reloadMessageList();
}
}
};
@ -113,7 +113,7 @@
MailBoxScreen.prototype.onStart = function ()
{
var
RL = require('../Boots/RainLoopApp.js'),
App = require('../Apps/RainLoopApp.js'),
fResizeFunction = function () {
Utils.windowResize();
}
@ -121,18 +121,18 @@
if (AppSettings.capa(Enums.Capa.AdditionalAccounts) || AppSettings.capa(Enums.Capa.AdditionalIdentities))
{
RL.accountsAndIdentities();
App.accountsAndIdentities();
}
_.delay(function () {
if ('INBOX' !== Data.currentFolderFullNameRaw())
{
RL.folderInformation('INBOX');
App.folderInformation('INBOX');
}
}, 1000);
_.delay(function () {
RL.quota();
App.quota();
}, 5000);
_.delay(function () {

8
dev/Screens/SettingsScreen.js
View file

@ -21,7 +21,7 @@
function SettingsScreen()
{
var
RL = require('../Boots/RainLoopApp.js'),
App = require('../Apps/RainLoopApp.js'),
SettingsSystemDropDownViewModel = require('../ViewModels/SettingsSystemDropDownViewModel.js'),
SettingsMenuViewModel = require('../ViewModels/SettingsMenuViewModel.js'),
@ -37,7 +37,7 @@
Utils.initOnStartOrLangChange(function () {
this.sSettingsTitle = Utils.i18n('TITLES/SETTINGS');
}, this, function () {
RL.setTitle(this.sSettingsTitle);
App.setTitle(this.sSettingsTitle);
});
}
@ -45,9 +45,9 @@
SettingsScreen.prototype.onShow = function ()
{
var RL = require('../Boots/RainLoopApp.js');
var App = require('../Apps/RainLoopApp.js');
RL.setTitle(this.sSettingsTitle);
App.setTitle(this.sSettingsTitle);
Globals.keyScope(Enums.KeyState.Settings);
};

8
dev/Admin/AdminSettingsAbout.js → dev/Settings/Admin/AdminSettingsAbout.js
View file

@ -14,8 +14,8 @@
function AdminSettingsAbout()
{
var
AppSettings = require('../Storages/AppSettings.js'),
Data = require('../Storages/AdminDataStorage.js')
AppSettings = require('../../Storages/AppSettings.js'),
Data = require('../../Storages/AdminDataStorage.js')
;
this.version = ko.observable(AppSettings.settingsGet('Version'));
@ -72,7 +72,7 @@
{
if (this.access())
{
require('../Boots/AdminApp.js').reloadCoreData();
require('../../Apps/AdminApp.js').reloadCoreData();
}
};
@ -80,7 +80,7 @@
{
if (!this.coreUpdating())
{
require('../Boots/AdminApp.js').updateCoreData();
require('../../Apps/AdminApp.js').updateCoreData();
}
};

4
dev/Admin/AdminSettingsBranding.js → dev/Settings/Admin/AdminSettingsBranding.js
View file

@ -18,7 +18,7 @@
{
var
Enums = require('Enums'),
AppSettings = require('../Storages/AppSettings.js')
AppSettings = require('../../Storages/AppSettings.js')
;
this.title = ko.observable(AppSettings.settingsGet('Title'));
@ -41,7 +41,7 @@
{
var
self = this,
Remote = require('../Storages/AdminAjaxRemoteStorage.js')
Remote = require('../../Storages/AdminAjaxRemoteStorage.js')
;
_.delay(function () {

6
dev/Admin/AdminSettingsContacts.js → dev/Settings/Admin/AdminSettingsContacts.js
View file

@ -11,7 +11,7 @@
Enums = require('Enums'),
Utils = require('Utils'),
AppSettings = require('../Storages/AppSettings.js')
AppSettings = require('../../Storages/AppSettings.js')
;
/**
@ -20,7 +20,7 @@
function AdminSettingsContacts()
{
var
Remote = require('../Storages/AdminAjaxRemoteStorage.js')
Remote = require('../../Storages/AdminAjaxRemoteStorage.js')
;
this.defautOptionsAfterRender = Utils.defautOptionsAfterRender;
@ -179,7 +179,7 @@
{
var
self = this,
Remote = require('../Storages/AdminAjaxRemoteStorage.js')
Remote = require('../../Storages/AdminAjaxRemoteStorage.js')
;
_.delay(function () {

10
dev/Admin/AdminSettingsDomains.js → dev/Settings/Admin/AdminSettingsDomains.js
View file

@ -11,10 +11,10 @@
Enums = require('Enums'),
PopupsDomainViewModel = require('../ViewModels/Popups/PopupsDomainViewModel.js'),
PopupsDomainViewModel = require('../../ViewModels/Popups/PopupsDomainViewModel.js'),
Data = require('../Storages/AdminDataStorage.js'),
Remote = require('../Storages/AdminAjaxRemoteStorage.js')
Data = require('../../Storages/AdminDataStorage.js'),
Remote = require('../../Storages/AdminAjaxRemoteStorage.js')
;
/**
@ -86,7 +86,7 @@
})
;
require('../Boots/AdminApp.js').reloadDomainList();
require('../../Apps/AdminApp.js').reloadDomainList();
};
AdminSettingsDomains.prototype.onDomainLoadRequest = function (sResult, oData)
@ -99,7 +99,7 @@
AdminSettingsDomains.prototype.onDomainListChangeRequest = function ()
{
require('../Boots/AdminApp.js').reloadDomainList();
require('../../Apps/AdminApp.js').reloadDomainList();
};
module.exports = AdminSettingsDomains;

8
dev/Admin/AdminSettingsGeneral.js → dev/Settings/Admin/AdminSettingsGeneral.js
View file

@ -12,10 +12,10 @@
Utils = require('Utils'),
LinkBuilder = require('LinkBuilder'),
AppSettings = require('../Storages/AppSettings.js'),
Data = require('../Storages/AdminDataStorage.js'),
AppSettings = require('../../Storages/AppSettings.js'),
Data = require('../../Storages/AdminDataStorage.js'),
PopupsLanguagesViewModel = require('../ViewModels/Popups/PopupsLanguagesViewModel.js')
PopupsLanguagesViewModel = require('../../ViewModels/Popups/PopupsLanguagesViewModel.js')
;
/**
@ -68,7 +68,7 @@
{
var
self = this,
Remote = require('../Storages/AdminAjaxRemoteStorage.js')
Remote = require('../../Storages/AdminAjaxRemoteStorage.js')
;
_.delay(function () {

10
dev/Admin/AdminSettingsLicensing.js → dev/Settings/Admin/AdminSettingsLicensing.js
View file

@ -8,10 +8,10 @@
ko = require('ko'),
moment = require('moment'),
AppSettings = require('../Storages/AppSettings.js'),
Data = require('../Storages/AdminDataStorage.js'),
AppSettings = require('../../Storages/AppSettings.js'),
Data = require('../../Storages/AdminDataStorage.js'),
PopupsActivateViewModel = require('../ViewModels/Popups/PopupsActivateViewModel.js')
PopupsActivateViewModel = require('../../ViewModels/Popups/PopupsActivateViewModel.js')
;
/**
@ -32,7 +32,7 @@
this.licenseTrigger.subscribe(function () {
if (this.subscriptionEnabled())
{
require('../Boots/AdminApp.js').reloadLicensing(true);
require('../../Apps/AdminApp.js').reloadLicensing(true);
}
}, this);
}
@ -41,7 +41,7 @@
{
if (this.subscriptionEnabled())
{
require('../Boots/AdminApp.js').reloadLicensing(false);
require('../../Apps/AdminApp.js').reloadLicensing(false);
}
};

6
dev/Admin/AdminSettingsLogin.js → dev/Settings/Admin/AdminSettingsLogin.js
View file

@ -11,8 +11,8 @@
Enums = require('Enums'),
Utils = require('Utils'),
AppSettings = require('../Storages/AppSettings.js'),
Data = require('../Storages/AdminDataStorage.js')
AppSettings = require('../../Storages/AppSettings.js'),
Data = require('../../Storages/AdminDataStorage.js')
;
/**
@ -33,7 +33,7 @@
{
var
self = this,
Remote = require('../Storages/AdminAjaxRemoteStorage.js')
Remote = require('../../Storages/AdminAjaxRemoteStorage.js')
;
_.delay(function () {

8
dev/Admin/AdminSettingsPackages.js → dev/Settings/Admin/AdminSettingsPackages.js
View file

@ -11,8 +11,8 @@
Enums = require('Enums'),
Utils = require('Utils'),
Data = require('../Storages/AdminDataStorage.js'),
Remote = require('../Storages/AdminAjaxRemoteStorage.js')
Data = require('../../Storages/AdminDataStorage.js'),
Remote = require('../../Storages/AdminAjaxRemoteStorage.js')
;
/**
@ -51,7 +51,7 @@
AdminSettingsPackages.prototype.onBuild = function ()
{
require('../Boots/AdminApp.js').reloadPackagesList();
require('../../Apps/AdminApp.js').reloadPackagesList();
};
AdminSettingsPackages.prototype.requestHelper = function (oPackage, bInstall)
@ -86,7 +86,7 @@
}
else
{
require('../Boots/AdminApp.js').reloadPackagesList();
require('../../Apps/AdminApp.js').reloadPackagesList();
}
};
};

12
dev/Admin/AdminSettingsPlugins.js → dev/Settings/Admin/AdminSettingsPlugins.js
View file

@ -11,11 +11,11 @@
Enums = require('Enums'),
Utils = require('Utils'),
AppSettings = require('../Storages/AppSettings.js'),
Data = require('../Storages/AdminDataStorage.js'),
Remote = require('../Storages/AdminAjaxRemoteStorage.js'),
AppSettings = require('../../Storages/AppSettings.js'),
Data = require('../../Storages/AdminDataStorage.js'),
Remote = require('../../Storages/AdminAjaxRemoteStorage.js'),
PopupsPluginViewModel = require('../ViewModels/Popups/PopupsPluginViewModel.js')
PopupsPluginViewModel = require('../../ViewModels/Popups/PopupsPluginViewModel.js')
;
/**
@ -80,7 +80,7 @@
AdminSettingsPlugins.prototype.onShow = function ()
{
this.pluginsError('');
require('../Boots/AdminApp.js').reloadPluginList();
require('../../Apps/AdminApp.js').reloadPluginList();
};
AdminSettingsPlugins.prototype.onPluginLoadRequest = function (sResult, oData)
@ -108,7 +108,7 @@
}
}
require('../Boots/AdminApp.js').reloadPluginList();
require('../../Apps/AdminApp.js').reloadPluginList();
};
module.exports = AdminSettingsPlugins;

8
dev/Admin/AdminSettingsSecurity.js → dev/Settings/Admin/AdminSettingsSecurity.js
View file

@ -12,9 +12,9 @@
Utils = require('Utils'),
LinkBuilder = require('LinkBuilder'),
AppSettings = require('../Storages/AppSettings.js'),
Data = require('../Storages/AdminDataStorage.js'),
Remote = require('../Storages/AdminAjaxRemoteStorage.js')
AppSettings = require('../../Storages/AppSettings.js'),
Data = require('../../Storages/AdminDataStorage.js'),
Remote = require('../../Storages/AdminAjaxRemoteStorage.js')
;
/**
@ -95,7 +95,7 @@
AdminSettingsSecurity.prototype.onBuild = function ()
{
var
Remote = require('../Storages/AdminAjaxRemoteStorage.js')
Remote = require('../../Storages/AdminAjaxRemoteStorage.js')
;
this.capaOpenPGP.subscribe(function (bValue) {

4
dev/Admin/AdminSettingsSocial.js → dev/Settings/Admin/AdminSettingsSocial.js
View file

@ -17,7 +17,7 @@
*/
function AdminSettingsSocial()
{
var Data = require('../Storages/AdminDataStorage.js');
var Data = require('../../Storages/AdminDataStorage.js');
this.googleEnable = Data.googleEnable;
this.googleClientID = Data.googleClientID;
@ -49,7 +49,7 @@
{
var
self = this,
Remote = require('../Storages/AdminAjaxRemoteStorage.js')
Remote = require('../../Storages/AdminAjaxRemoteStorage.js')
;
_.delay(function () {

10
dev/Settings/SettingsAccounts.js → dev/Settings/App/SettingsAccounts.js
View file

@ -13,11 +13,11 @@
Utils = require('Utils'),
LinkBuilder = require('LinkBuilder'),
Data = require('../Storages/WebMailDataStorage.js'),
Remote = require('../Storages/WebMailAjaxRemoteStorage.js'),
Data = require('../../Storages/WebMailDataStorage.js'),
Remote = require('../../Storages/WebMailAjaxRemoteStorage.js'),
kn = require('kn'),
PopupsAddAccountViewModel = require('../ViewModels/Popups/PopupsAddAccountViewModel.js')
PopupsAddAccountViewModel = require('../../ViewModels/Popups/PopupsAddAccountViewModel.js')
;
/**
@ -65,7 +65,7 @@
this.accountForDeletion(null);
var
RL = require('../Boots/RainLoopApp.js'),
App = require('../../Apps/RainLoopApp.js'),
fRemoveAccount = function (oAccount) {
return oAccountToRemove === oAccount;
}
@ -90,7 +90,7 @@
}
else
{
RL.accountsAndIdentities();
App.accountsAndIdentities();
}
}, oAccountToRemove.email);

2
dev/Settings/SettingsChangePassword.js → dev/Settings/App/SettingsChangePassword.js
View file

@ -11,7 +11,7 @@
Enums = require('Enums'),
Utils = require('Utils'),
Remote = require('../Storages/WebMailAjaxRemoteStorage.js')
Remote = require('../../Storages/WebMailAjaxRemoteStorage.js')
;
/**

4
dev/Settings/SettingsContacts.js → dev/Settings/App/SettingsContacts.js
View file

@ -9,8 +9,8 @@
Utils = require('Utils'),
Remote = require('../Storages/WebMailAjaxRemoteStorage.js'),
Data = require('../Storages/WebMailDataStorage.js')
Remote = require('../../Storages/WebMailAjaxRemoteStorage.js'),
Data = require('../../Storages/WebMailDataStorage.js')
;
/**

4
dev/Settings/SettingsFilters.js → dev/Settings/App/SettingsFilters.js
View file

@ -31,8 +31,8 @@
{
var
kn = require('kn'),
FilterModel = require('../Models/FilterModel.js'),
PopupsFilterViewModel = require('../ViewModels/Popups/PopupsFilterViewModel.js')
FilterModel = require('../../Models/FilterModel.js'),
PopupsFilterViewModel = require('../../ViewModels/Popups/PopupsFilterViewModel.js')
;
kn.showScreenPopup(PopupsFilterViewModel, [new FilterModel()]);

22
dev/Settings/SettingsFolders.js → dev/Settings/App/SettingsFolders.js
View file

@ -12,14 +12,14 @@
kn = require('kn'),
AppSettings = require('../Storages/AppSettings.js'),
LocalStorage = require('../Storages/LocalStorage.js'),
Data = require('../Storages/WebMailDataStorage.js'),
Cache = require('../Storages/WebMailCacheStorage.js'),
Remote = require('../Storages/WebMailAjaxRemoteStorage.js'),
AppSettings = require('../../Storages/AppSettings.js'),
LocalStorage = require('../../Storages/LocalStorage.js'),
Data = require('../../Storages/WebMailDataStorage.js'),
Cache = require('../../Storages/WebMailCacheStorage.js'),
Remote = require('../../Storages/WebMailAjaxRemoteStorage.js'),
PopupsFolderCreateViewModel = require('../ViewModels/Popups/PopupsFolderCreateViewModel.js'),
PopupsFolderSystemViewModel = require('../ViewModels/Popups/PopupsFolderSystemViewModel.js')
PopupsFolderCreateViewModel = require('../../ViewModels/Popups/PopupsFolderCreateViewModel.js'),
PopupsFolderSystemViewModel = require('../../ViewModels/Popups/PopupsFolderSystemViewModel.js')
;
/**
@ -98,7 +98,7 @@
SettingsFolders.prototype.folderEditOnEnter = function (oFolder)
{
var
RL = require('../Boots/RainLoopApp.js'),
App = require('../../Apps/RainLoopApp.js'),
sEditName = oFolder ? Utils.trim(oFolder.nameForEdit()) : ''
;
@ -116,7 +116,7 @@
oData && oData.ErrorCode ? Utils.getNotification(oData.ErrorCode) : Utils.i18n('NOTIFICATIONS/CANT_RENAME_FOLDER'));
}
RL.folders();
App.folders();
}, oFolder.fullNameRaw, sEditName);
@ -159,7 +159,7 @@
this.folderForDeletion(null);
var
RL = require('../Boots/RainLoopApp.js'),
App = require('../../Apps/RainLoopApp.js'),
fRemoveFolder = function (oFolder) {
if (oFolderToRemove === oFolder)
@ -188,7 +188,7 @@
oData && oData.ErrorCode ? Utils.getNotification(oData.ErrorCode) : Utils.i18n('NOTIFICATIONS/CANT_DELETE_FOLDER'));
}
RL.folders();
App.folders();
}, oFolderToRemove.fullNameRaw);

7
dev/Settings/SettingsGeneral.js → dev/Settings/App/SettingsGeneral.js
View file

@ -7,6 +7,7 @@
var
$ = require('$'),
ko = require('ko'),
_ = require('_'),
Enums = require('Enums'),
Consts = require('Consts'),
@ -14,11 +15,11 @@
Utils = require('Utils'),
LinkBuilder = require('LinkBuilder'),
Data = require('../Storages/WebMailDataStorage.js'),
Remote = require('../Storages/WebMailAjaxRemoteStorage.js'),
Data = require('../../Storages/WebMailDataStorage.js'),
Remote = require('../../Storages/WebMailAjaxRemoteStorage.js'),
kn = require('kn'),
PopupsLanguagesViewModel = require('../ViewModels/Popups/PopupsLanguagesViewModel.js')
PopupsLanguagesViewModel = require('../../ViewModels/Popups/PopupsLanguagesViewModel.js')
;
/**

11
dev/Settings/SettingsIdentities.js → dev/Settings/App/SettingsIdentities.js
View file

@ -6,16 +6,17 @@
var
ko = require('ko'),
_ = require('_'),
Enums = require('Enums'),
Utils = require('Utils'),
NewHtmlEditorWrapper = require('NewHtmlEditorWrapper'),
Data = require('../Storages/WebMailDataStorage.js'),
Remote = require('../Storages/WebMailAjaxRemoteStorage.js'),
Data = require('../../Storages/WebMailDataStorage.js'),
Remote = require('../../Storages/WebMailAjaxRemoteStorage.js'),
kn = require('kn'),
PopupsIdentityViewModel = require('../ViewModels/Popups/PopupsIdentityViewModel.js')
PopupsIdentityViewModel = require('../../ViewModels/Popups/PopupsIdentityViewModel.js')
;
/**
@ -133,7 +134,7 @@
this.identityForDeletion(null);
var
RL = require('../Boots/RainLoopApp.js'),
App = require('../../Apps/RainLoopApp.js'),
fRemoveFolder = function (oIdentity) {
return oIdentityToRemove === oIdentity;
}
@ -144,7 +145,7 @@
this.identities.remove(fRemoveFolder);
Remote.identityDelete(function () {
RL.accountsAndIdentities();
App.accountsAndIdentities();
}, oIdentityToRemove.id);
}
}

5
dev/Settings/SettingsIdentity.js → dev/Settings/App/SettingsIdentity.js
View file

@ -6,13 +6,14 @@
var
ko = require('ko'),
_ = require('_'),
Enums = require('Enums'),
Utils = require('Utils'),
NewHtmlEditorWrapper = require('NewHtmlEditorWrapper'),
Data = require('../Storages/WebMailDataStorage.js'),
Remote = require('../Storages/WebMailAjaxRemoteStorage.js')
Data = require('../../Storages/WebMailDataStorage.js'),
Remote = require('../../Storages/WebMailAjaxRemoteStorage.js')
;
/**

12
dev/Settings/SettingsOpenPGP.js → dev/Settings/App/SettingsOpenPGP.js
View file

@ -9,11 +9,11 @@
kn = require('kn'),
Data = require('../Storages/WebMailDataStorage.js'),
Data = require('../../Storages/WebMailDataStorage.js'),
PopupsAddOpenPgpKeyViewModel = require('../ViewModels/Popups/PopupsAddOpenPgpKeyViewModel.js'),
PopupsGenerateNewOpenPgpKeyViewModel = require('../ViewModels/Popups/PopupsGenerateNewOpenPgpKeyViewModel.js'),
PopupsViewOpenPgpKeyViewModel = require('../ViewModels/Popups/PopupsViewOpenPgpKeyViewModel.js')
PopupsAddOpenPgpKeyViewModel = require('../../ViewModels/Popups/PopupsAddOpenPgpKeyViewModel.js'),
PopupsGenerateNewOpenPgpKeyViewModel = require('../../ViewModels/Popups/PopupsGenerateNewOpenPgpKeyViewModel.js'),
PopupsViewOpenPgpKeyViewModel = require('../../ViewModels/Popups/PopupsViewOpenPgpKeyViewModel.js')
;
/**
@ -78,8 +78,8 @@
Data.openpgpKeyring.store();
var RL = require('../Boots/RainLoopApp.js');
RL.reloadOpenPgpKeys();
var App = require('../../Apps/RainLoopApp.js');
App.reloadOpenPgpKeys();
}
}
};

4
dev/Settings/SettingsSecurity.js → dev/Settings/App/SettingsSecurity.js
View file

@ -11,10 +11,10 @@
Globals = require('Globals'),
Utils = require('Utils'),
Remote = require('../Storages/WebMailAjaxRemoteStorage.js'),
Remote = require('../../Storages/WebMailAjaxRemoteStorage.js'),
kn = require('kn'),
PopupsTwoFactorTestViewModel = require('../ViewModels/Popups/PopupsTwoFactorTestViewModel.js')
PopupsTwoFactorTestViewModel = require('../../ViewModels/Popups/PopupsTwoFactorTestViewModel.js')
;
/**

16
dev/Settings/SettingsSocial.js → dev/Settings/App/SettingsSocial.js
View file

@ -11,8 +11,8 @@
{
var
Utils = require('Utils'),
RL = require('../Boots/RainLoopApp.js'),
Data = require('../Storages/WebMailDataStorage.js')
App = require('../../Apps/RainLoopApp.js'),
Data = require('../../Storages/WebMailDataStorage.js')
;
this.googleEnable = Data.googleEnable;
@ -36,40 +36,40 @@
this.connectGoogle = Utils.createCommand(this, function () {
if (!this.googleLoggined())
{
RL.googleConnect();
App.googleConnect();
}
}, function () {
return !this.googleLoggined() && !this.googleActions();
});
this.disconnectGoogle = Utils.createCommand(this, function () {
RL.googleDisconnect();
App.googleDisconnect();
});
this.connectFacebook = Utils.createCommand(this, function () {
if (!this.facebookLoggined())
{
RL.facebookConnect();
App.facebookConnect();
}
}, function () {
return !this.facebookLoggined() && !this.facebookActions();
});
this.disconnectFacebook = Utils.createCommand(this, function () {
RL.facebookDisconnect();
App.facebookDisconnect();
});
this.connectTwitter = Utils.createCommand(this, function () {
if (!this.twitterLoggined())
{
RL.twitterConnect();
App.twitterConnect();
}
}, function () {
return !this.twitterLoggined() && !this.twitterActions();
});
this.disconnectTwitter = Utils.createCommand(this, function () {
RL.twitterDisconnect();
App.twitterDisconnect();
});
}

5
dev/Settings/SettingsThemes.js → dev/Settings/App/SettingsThemes.js
View file

@ -8,13 +8,14 @@
window = require('window'),
$ = require('$'),
ko = require('ko'),
_ = require('_'),
Enums = require('Enums'),
Utils = require('Utils'),
LinkBuilder = require('LinkBuilder'),
Data = require('../Storages/WebMailDataStorage.js'),
Remote = require('../Storages/WebMailAjaxRemoteStorage.js')
Data = require('../../Storages/WebMailDataStorage.js'),
Remote = require('../../Storages/WebMailAjaxRemoteStorage.js')
;
/**

8
dev/Storages/AbstractAjaxRemoteStorage.js
View file

@ -63,9 +63,9 @@
if (Consts.Values.TokenErrorLimit < Globals.iTokenErrorCount)
{
if (Globals.__RL)
if (Globals.__APP)
{
Globals.__RL.loginAndLogoutReload(true);
Globals.__APP.loginAndLogoutReload(true);
}
}
@ -76,9 +76,9 @@
window.__rlah_clear();
}
if (Globals.__RL)
if (Globals.__APP)
{
Globals.__RL.loginAndLogoutReload(true);
Globals.__APP.loginAndLogoutReload(true);
}
}
}

4
dev/Storages/WebMailAjaxRemoteStorage.js
View file

@ -381,9 +381,9 @@
}
else if (Data.useThreads())
{
if (Globals.__RL)
if (Globals.__APP)
{
Globals.__RL.reloadFlagsCurrentMessageListAndMessageFromCache();
Globals.__APP.reloadFlagsCurrentMessageListAndMessageFromCache();
}
}
};

8
dev/Storages/WebMailDataStorage.js
View file

@ -325,9 +325,9 @@
if (Enums.Layout.NoPreview === this.layout() &&
-1 < window.location.hash.indexOf('message-preview'))
{
if (Globals.__RL)
if (Globals.__APP)
{
Globals.__RL.historyBack();
Globals.__APP.historyBack();
}
}
}
@ -925,9 +925,9 @@
Cache.initMessageFlagsFromCache(oMessage);
if (oMessage.unseen())
{
if (Globals.__RL)
if (Globals.__APP)
{
Globals.__RL.setMessageSeen(oMessage);
Globals.__APP.setMessageSeen(oMessage);
}
}

4
dev/ViewModels/AbstractSystemDropDownViewModel.js
View file

@ -89,14 +89,14 @@
AbstractSystemDropDownViewModel.prototype.logoutClick = function ()
{
var RL = require('../Boots/RainLoopApp.js');
var App = require('../Apps/RainLoopApp.js');
Remote.logout(function () {
if (window.__rlah_clear)
{
window.__rlah_clear();
}
RL.loginAndLogoutReload(true, AppSettings.settingsGet('ParentEmail') && 0 < AppSettings.settingsGet('ParentEmail').length);
App.loginAndLogoutReload(true, AppSettings.settingsGet('ParentEmail') && 0 < AppSettings.settingsGet('ParentEmail').length);
});
};

4
dev/ViewModels/AdminLoginViewModel.js
View file

@ -64,8 +64,8 @@
{
if (oData.Result)
{
var RL = require('../Boots/AdminApp.js');
RL.loginAndLogoutReload();
var App = require('../Apps/AdminApp.js');
App.loginAndLogoutReload();
}
else if (oData.ErrorCode)
{

4
dev/ViewModels/AdminPaneViewModel.js
View file

@ -36,8 +36,8 @@
AdminPaneViewModel.prototype.logoutClick = function ()
{
Remote.adminLogout(function () {
var RL = require('../Boots/AdminApp.js');
RL.loginAndLogoutReload();
var App = require('../Apps/AdminApp.js');
App.loginAndLogoutReload();
});
};

8
dev/ViewModels/LoginViewModel.js
View file

@ -133,8 +133,8 @@
}
else
{
var RL = require('../Boots/RainLoopApp.js');
RL.loginAndLogoutReload();
var App = require('../Apps/RainLoopApp.js');
App.loginAndLogoutReload();
}
}
else if (oData.ErrorCode)
@ -294,8 +294,8 @@
{
self.submitRequest(true);
var RL = require('../Boots/RainLoopApp.js');
RL.loginAndLogoutReload();
var App = require('../Apps/RainLoopApp.js');
App.loginAndLogoutReload();
}
else
{

14
dev/ViewModels/MailBoxFolderListViewModel.js
View file

@ -62,7 +62,7 @@
var
self = this,
RL = require('../Boots/RainLoopApp.js')
App = require('../Apps/RainLoopApp.js')
;
oDom
@ -76,7 +76,7 @@
if (oFolder && oEvent)
{
bCollapsed = oFolder.collapsed();
RL.setExpandedFolder(oFolder.fullNameHash, bCollapsed);
App.setExpandedFolder(oFolder.fullNameHash, bCollapsed);
oFolder.collapsed(!bCollapsed);
oEvent.preventDefault();
@ -159,7 +159,7 @@
if (oFolder)
{
bCollapsed = oFolder.collapsed();
RL.setExpandedFolder(oFolder.fullNameHash, bCollapsed);
App.setExpandedFolder(oFolder.fullNameHash, bCollapsed);
oFolder.collapsed(!bCollapsed);
}
}
@ -186,10 +186,10 @@
window.clearTimeout(this.iDropOverTimer);
if (oFolder && oFolder.collapsed())
{
var RL = require('../Boots/RainLoopApp.js');
var App = require('../Apps/RainLoopApp.js');
this.iDropOverTimer = window.setTimeout(function () {
oFolder.collapsed(false);
RL.setExpandedFolder(oFolder.fullNameHash, true);
App.setExpandedFolder(oFolder.fullNameHash, true);
Utils.windowResize();
}, 500);
}
@ -242,7 +242,7 @@
if (oToFolder && oUi && oUi.helper)
{
var
RL = require('../Boots/RainLoopApp.js'),
App = require('../Apps/RainLoopApp.js'),
sFromFolderFullNameRaw = oUi.helper.data('rl-folder'),
bCopy = $html.hasClass('rl-ctrl-key-pressed'),
aUids = oUi.helper.data('rl-uids')
@ -250,7 +250,7 @@
if (Utils.isNormal(sFromFolderFullNameRaw) && '' !== sFromFolderFullNameRaw && Utils.isArray(aUids))
{
RL.moveMessagesToFolder(sFromFolderFullNameRaw, aUids, oToFolder.fullNameRaw, bCopy);
App.moveMessagesToFolder(sFromFolderFullNameRaw, aUids, oToFolder.fullNameRaw, bCopy);
}
}
};

35
dev/ViewModels/MailBoxMessageListViewModel.js
View file

@ -39,7 +39,7 @@
*/
function MailBoxMessageListViewModel()
{
var RL = require('../Boots/RainLoopApp.js');
var App = require('../Apps/RainLoopApp.js');
KnoinAbstractViewModel.call(this, 'Right', 'MailMessageList');
@ -183,31 +183,31 @@
}, this.canBeMoved);
this.deleteWithoutMoveCommand = Utils.createCommand(this, function () {
RL.deleteMessagesFromFolder(Enums.FolderType.Trash,
App.deleteMessagesFromFolder(Enums.FolderType.Trash,
Data.currentFolderFullNameRaw(),
Data.messageListCheckedOrSelectedUidsWithSubMails(), false);
}, this.canBeMoved);
this.deleteCommand = Utils.createCommand(this, function () {
RL.deleteMessagesFromFolder(Enums.FolderType.Trash,
App.deleteMessagesFromFolder(Enums.FolderType.Trash,
Data.currentFolderFullNameRaw(),
Data.messageListCheckedOrSelectedUidsWithSubMails(), true);
}, this.canBeMoved);
this.archiveCommand = Utils.createCommand(this, function () {
RL.deleteMessagesFromFolder(Enums.FolderType.Archive,
App.deleteMessagesFromFolder(Enums.FolderType.Archive,
Data.currentFolderFullNameRaw(),
Data.messageListCheckedOrSelectedUidsWithSubMails(), true);
}, this.canBeMoved);
this.spamCommand = Utils.createCommand(this, function () {
RL.deleteMessagesFromFolder(Enums.FolderType.Spam,
App.deleteMessagesFromFolder(Enums.FolderType.Spam,
Data.currentFolderFullNameRaw(),
Data.messageListCheckedOrSelectedUidsWithSubMails(), true);
}, this.canBeMoved);
this.notSpamCommand = Utils.createCommand(this, function () {
RL.deleteMessagesFromFolder(Enums.FolderType.NotSpam,
App.deleteMessagesFromFolder(Enums.FolderType.NotSpam,
Data.currentFolderFullNameRaw(),
Data.messageListCheckedOrSelectedUidsWithSubMails(), true);
}, this.canBeMoved);
@ -217,7 +217,7 @@
this.reloadCommand = Utils.createCommand(this, function () {
if (!Data.messageListCompleteLoadingThrottle())
{
RL.reloadMessageList(false, true);
App.reloadMessageList(false, true);
}
});
@ -307,8 +307,8 @@
{
if (this.canBeMoved())
{
var RL = require('../Boots/RainLoopApp.js');
RL.moveMessagesToFolder(
var App = require('../Apps/RainLoopApp.js');
App.moveMessagesToFolder(
Data.currentFolderFullNameRaw(),
Data.messageListCheckedOrSelectedUidsWithSubMails(), sToFolderFullNameRaw, bCopy);
}
@ -396,7 +396,7 @@
aUids = [],
oFolder = null,
iAlreadyUnread = 0,
RL = require('../Boots/RainLoopApp.js')
App = require('../Apps/RainLoopApp.js')
;
if (Utils.isUnd(aMessages))
@ -464,7 +464,7 @@
break;
}
RL.reloadFlagsCurrentMessageListAndMessageFromCache();
App.reloadFlagsCurrentMessageListAndMessageFromCache();
}
};
@ -477,7 +477,7 @@
var
oFolder = null,
aMessages = Data.messageList(),
RL = require('../Boots/RainLoopApp.js')
App = require('../Apps/RainLoopApp.js')
;
if ('' !== sFolderFullNameRaw)
@ -516,7 +516,7 @@
break;
}
RL.reloadFlagsCurrentMessageListAndMessageFromCache();
App.reloadFlagsCurrentMessageListAndMessageFromCache();
}
}
};
@ -631,7 +631,7 @@
{
var
self = this,
RL = require('../Boots/RainLoopApp.js')
App = require('../Apps/RainLoopApp.js')
;
this.oContentVisible = $('.b-content', oDom);
@ -663,7 +663,7 @@
oMessage.lastInCollapsedThreadLoading(true);
oMessage.lastInCollapsedThread(!oMessage.lastInCollapsedThread());
RL.reloadMessageList();
App.reloadMessageList();
}
return false;
@ -894,8 +894,7 @@
}
var
RL = require('../Boots/RainLoopApp.js'),
oJua = new Jua({
oJua = new Jua({
'action': LinkBuilder.append(),
'name': 'AppendFile',
'queueSize': 1,
@ -934,7 +933,7 @@
return false;
}, this))
.on('onComplete', _.bind(function () {
RL.reloadMessageList(true, true);
require('../Apps/RainLoopApp.js').reloadMessageList(true, true);
}, this))
;

22
dev/ViewModels/MailBoxMessageViewViewModel.js
View file

@ -37,7 +37,7 @@
var
self = this,
sLastEmail = '',
RL = require('../Boots/RainLoopApp.js'),
App = require('../Apps/RainLoopApp.js'),
createCommandHelper = function (sType) {
return Utils.createCommand(self, function () {
this.replyOrforward(sType);
@ -102,7 +102,7 @@
this.deleteCommand = Utils.createCommand(this, function () {
if (this.message())
{
RL.deleteMessagesFromFolder(Enums.FolderType.Trash,
App.deleteMessagesFromFolder(Enums.FolderType.Trash,
this.message().folderFullNameRaw,
[this.message().uid], true);
}
@ -111,7 +111,7 @@
this.deleteWithoutMoveCommand = Utils.createCommand(this, function () {
if (this.message())
{
RL.deleteMessagesFromFolder(Enums.FolderType.Trash,
App.deleteMessagesFromFolder(Enums.FolderType.Trash,
Data.currentFolderFullNameRaw(),
[this.message().uid], false);
}
@ -120,7 +120,7 @@
this.archiveCommand = Utils.createCommand(this, function () {
if (this.message())
{
RL.deleteMessagesFromFolder(Enums.FolderType.Archive,
App.deleteMessagesFromFolder(Enums.FolderType.Archive,
this.message().folderFullNameRaw,
[this.message().uid], true);
}
@ -129,7 +129,7 @@
this.spamCommand = Utils.createCommand(this, function () {
if (this.message())
{
RL.deleteMessagesFromFolder(Enums.FolderType.Spam,
App.deleteMessagesFromFolder(Enums.FolderType.Spam,
this.message().folderFullNameRaw,
[this.message().uid], true);
}
@ -138,7 +138,7 @@
this.notSpamCommand = Utils.createCommand(this, function () {
if (this.message())
{
RL.deleteMessagesFromFolder(Enums.FolderType.NotSpam,
App.deleteMessagesFromFolder(Enums.FolderType.NotSpam,
this.message().folderFullNameRaw,
[this.message().uid], true);
}
@ -343,7 +343,7 @@
{
var
self = this,
RL = require('../Boots/RainLoopApp.js')
App = require('../Apps/RainLoopApp.js')
;
this.fullScreenMode.subscribe(function (bValue) {
@ -382,7 +382,7 @@
})
.on('click', 'a', function (oEvent) {
// setup maito protocol
return !(!!oEvent && 3 !== oEvent['which'] && RL.mailToHelper($(this).attr('href')));
return !(!!oEvent && 3 !== oEvent['which'] && App.mailToHelper($(this).attr('href')));
})
.on('click', '.attachmentsPlace .attachmentPreview', function (oEvent) {
if (oEvent && oEvent.stopPropagation)
@ -398,7 +398,7 @@
if (oAttachment && oAttachment.download)
{
RL.download(oAttachment.linkDownload());
App.download(oAttachment.linkDownload());
}
})
;
@ -713,8 +713,8 @@
Cache.storeMessageFlagsToCache(oMessage);
var RL = require('../Boots/RainLoopApp.js');
RL.reloadFlagsCurrentMessageListAndMessageFromCache();
var App = require('../Apps/RainLoopApp.js');
App.reloadFlagsCurrentMessageListAndMessageFromCache();
}
};

4
dev/ViewModels/Popups/PopupsAddAccountViewModel.js
View file

@ -25,7 +25,7 @@
{
KnoinAbstractViewModel.call(this, 'Popups', 'PopupsAddAccount');
var RL = require('../../Boots/RainLoopApp.js');
var App = require('../../Apps/RainLoopApp.js');
this.email = ko.observable('');
this.password = ko.observable('');
@ -65,7 +65,7 @@
{
if (oData.Result)
{
RL.accountsAndIdentities();
App.accountsAndIdentities();
this.cancelCommand();
}
else if (oData.ErrorCode)

4
dev/ViewModels/Popups/PopupsAddOpenPgpKeyViewModel.js
View file

@ -23,7 +23,7 @@
{
KnoinAbstractViewModel.call(this, 'Popups', 'PopupsAddOpenPgpKey');
var RL = require('../../Boots/RainLoopApp.js');
var App = require('../../Apps/RainLoopApp.js');
this.key = ko.observable('');
this.key.error = ko.observable(false);
@ -79,7 +79,7 @@
oOpenpgpKeyring.store();
RL.reloadOpenPgpKeys();
App.reloadOpenPgpKeys();
Utils.delegateRun(this, 'cancelCommand');
return true;

16
dev/ViewModels/Popups/PopupsComposeViewModel.js
View file

@ -45,7 +45,7 @@
{
KnoinAbstractViewModel.call(this, 'Popups', 'PopupsCompose');
var RL = require('../../Boots/RainLoopApp.js');
var App = require('../../Apps/RainLoopApp.js');
this.oEditor = null;
this.aDraftInfo = null;
@ -219,7 +219,7 @@
this.deleteCommand = Utils.createCommand(this, function () {
RL.deleteMessagesFromFolderWithoutCheck(this.draftFolder(), [this.draftUid()]);
App.deleteMessagesFromFolderWithoutCheck(this.draftFolder(), [this.draftUid()]);
kn.hideScreenPopup(PopupsComposeViewModel);
}, function () {
@ -278,7 +278,7 @@
}
Cache.setMessageFlagsToCache(this.aDraftInfo[2], this.aDraftInfo[1], aFlagsCache);
RL.reloadFlagsCurrentMessageListAndMessageFromCache();
App.reloadFlagsCurrentMessageListAndMessageFromCache();
Cache.setFolderHash(this.aDraftInfo[2], '');
}
}
@ -415,8 +415,8 @@
PopupsComposeViewModel.prototype.emailsSource = function (oData, fResponse)
{
var RL = require('../../Boots/RainLoopApp.js');
RL.getAutocomplete(oData.term, function (aData) {
var App = require('../../Apps/RainLoopApp.js');
App.getAutocomplete(oData.term, function (aData) {
fResponse(_.map(aData, function (oEmailItem) {
return oEmailItem.toLine(false);
}));
@ -446,7 +446,7 @@
PopupsComposeViewModel.prototype.reloadDraftFolder = function ()
{
var
RL = require('../../Boots/RainLoopApp.js'),
App = require('../../Apps/RainLoopApp.js'),
sDraftFolder = Data.draftFolder()
;
@ -455,11 +455,11 @@
Cache.setFolderHash(sDraftFolder, '');
if (Data.currentFolderFullNameRaw() === sDraftFolder)
{
RL.reloadMessageList(true);
App.reloadMessageList(true);
}
else
{
RL.folderInformation(sDraftFolder);
App.folderInformation(sDraftFolder);
}
}
};

16
dev/ViewModels/Popups/PopupsContactsViewModel.js
View file

@ -353,10 +353,10 @@
var
self = this,
RL = require('../../Boots/RainLoopApp.js')
App = require('../../Apps/RainLoopApp.js')
;
RL.contactsSync(function (sResult, oData) {
App.contactsSync(function (sResult, oData) {
if (Enums.StorageResultType.Success !== sResult || !oData || !oData.Result)
{
window.alert(Utils.getNotification(
@ -401,8 +401,8 @@
PopupsContactsViewModel.prototype.contactTagsSource = function (oData, fResponse)
{
var RL = require('../../Boots/RainLoopApp.js');
RL.getContactTagsAutocomplete(oData.term, function (aData) {
var App = require('../../Apps/RainLoopApp.js');
App.getContactTagsAutocomplete(oData.term, function (aData) {
fResponse(_.map(aData, function (oTagItem) {
return oTagItem.toLine(false);
}));
@ -487,14 +487,14 @@
PopupsContactsViewModel.prototype.exportVcf = function ()
{
var RL = require('../../Boots/RainLoopApp.js');
RL.download(LinkBuilder.exportContactsVcf());
var App = require('../../Apps/RainLoopApp.js');
App.download(LinkBuilder.exportContactsVcf());
};
PopupsContactsViewModel.prototype.exportCsv = function ()
{
var RL = require('../../Boots/RainLoopApp.js');
RL.download(LinkBuilder.exportContactsCsv());
var App = require('../../Apps/RainLoopApp.js');
App.download(LinkBuilder.exportContactsCsv());
};
PopupsContactsViewModel.prototype.initUploader = function ()

4
dev/ViewModels/Popups/PopupsDomainViewModel.js
View file

@ -235,8 +235,8 @@
{
if (oData.Result)
{
var RL = require('../../Boots/AdminApp.js');
RL.reloadDomainList();
var App = require('../../Apps/AdminApp.js');
App.reloadDomainList();
this.closeCommand();
}

8
dev/ViewModels/Popups/PopupsFolderClearViewModel.js
View file

@ -26,7 +26,7 @@
{
KnoinAbstractViewModel.call(this, 'Popups', 'PopupsFolderClear');
var RL = require('../../Boots/RainLoopApp.js');
var App = require('../../Apps/RainLoopApp.js');
this.selectedFolder = ko.observable(null);
this.clearingProcess = ko.observable(false);
@ -62,13 +62,17 @@
this.clearingProcess(true);
oFolderToClear.messageCountAll(0);
oFolderToClear.messageCountUnread(0);
Cache.setFolderHash(oFolderToClear.fullNameRaw, '');
Remote.folderClear(function (sResult, oData) {
self.clearingProcess(false);
if (Enums.StorageResultType.Success === sResult && oData && oData.Result)
{
RL.reloadMessageList(true);
App.reloadMessageList(true);
self.cancelCommand();
}
else

4
dev/ViewModels/Popups/PopupsFolderCreateViewModel.js
View file

@ -65,7 +65,7 @@
this.createFolder = Utils.createCommand(this, function () {
var
RL = require('../../Boots/RainLoopApp.js'),
App = require('../../Apps/RainLoopApp.js'),
sParentFolderName = this.selectedParentValue()
;
@ -80,7 +80,7 @@
Data.foldersCreating(false);
if (Enums.StorageResultType.Success === sResult && oData && oData.Result)
{
RL.folders();
App.folders();
}
else
{

4
dev/ViewModels/Popups/PopupsGenerateNewOpenPgpKeyViewModel.js
View file

@ -25,7 +25,7 @@
{
KnoinAbstractViewModel.call(this, 'Popups', 'PopupsGenerateNewOpenPgpKey');
var RL = require('../../Boots/RainLoopApp.js');
var App = require('../../Apps/RainLoopApp.js');
this.email = ko.observable('');
this.email.focus = ko.observable('');
@ -78,7 +78,7 @@
oOpenpgpKeyring.publicKeys.importKey(mKeyPair.publicKeyArmored);
oOpenpgpKeyring.store();
RL.reloadOpenPgpKeys();
App.reloadOpenPgpKeys();
Utils.delegateRun(self, 'cancelCommand');
}

4
dev/ViewModels/Popups/PopupsIdentityViewModel.js
View file

@ -25,7 +25,7 @@
{
KnoinAbstractViewModel.call(this, 'Popups', 'PopupsIdentity');
var RL = require('../../Boots/RainLoopApp.js');
var App = require('../../Apps/RainLoopApp.js');
this.id = '';
this.edit = ko.observable(false);
@ -85,7 +85,7 @@
{
if (oData.Result)
{
RL.accountsAndIdentities();
App.accountsAndIdentities();
this.cancelCommand();
}
else if (oData.ErrorCode)