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

Browse source
This commit is contained in:
RainLoop Team 2014-08-27 19:59:44 +04:00
parent 36329110e5
commit b4f416b6f8
105 changed files with 4331 additions and 4339 deletions
Download patch file Download diff file Expand all files Collapse all files

12
dev/Settings/Admin/AdminSettingsAbout.js
View file

@ -14,12 +14,12 @@
function AdminSettingsAbout()
{
var
AppSettings = require('../../Storages/AppSettings.js'),
Data = require('../../Storages/AdminDataStorage.js')
Settings = require('Storage:Settings'),
Data = require('Storage:Admin:Data')
;
this.version = ko.observable(AppSettings.settingsGet('Version'));
this.access = ko.observable(!!AppSettings.settingsGet('CoreAccess'));
this.version = ko.observable(Settings.settingsGet('Version'));
this.access = ko.observable(!!Settings.settingsGet('CoreAccess'));
this.errorDesc = ko.observable('');
this.coreReal = Data.coreReal;
@ -72,7 +72,7 @@
{
if (this.access())
{
require('../../Apps/AdminApp.js').reloadCoreData();
require('App:Admin').reloadCoreData();
}
};
@ -80,7 +80,7 @@
{
if (!this.coreUpdating())
{
require('../../Apps/AdminApp.js').updateCoreData();
require('App:Admin').updateCoreData();
}
};

14
dev/Settings/Admin/AdminSettingsBranding.js
View file

@ -18,22 +18,22 @@
{
var
Enums = require('Enums'),
AppSettings = require('../../Storages/AppSettings.js')
Settings = require('Storage:Settings')
;
this.title = ko.observable(AppSettings.settingsGet('Title'));
this.title = ko.observable(Settings.settingsGet('Title'));
this.title.trigger = ko.observable(Enums.SaveSettingsStep.Idle);
this.loadingDesc = ko.observable(AppSettings.settingsGet('LoadingDescription'));
this.loadingDesc = ko.observable(Settings.settingsGet('LoadingDescription'));
this.loadingDesc.trigger = ko.observable(Enums.SaveSettingsStep.Idle);
this.loginLogo = ko.observable(AppSettings.settingsGet('LoginLogo'));
this.loginLogo = ko.observable(Settings.settingsGet('LoginLogo'));
this.loginLogo.trigger = ko.observable(Enums.SaveSettingsStep.Idle);
this.loginDescription = ko.observable(AppSettings.settingsGet('LoginDescription'));
this.loginDescription = ko.observable(Settings.settingsGet('LoginDescription'));
this.loginDescription.trigger = ko.observable(Enums.SaveSettingsStep.Idle);
this.loginCss = ko.observable(AppSettings.settingsGet('LoginCss'));
this.loginCss = ko.observable(Settings.settingsGet('LoginCss'));
this.loginCss.trigger = ko.observable(Enums.SaveSettingsStep.Idle);
}
@ -41,7 +41,7 @@
{
var
self = this,
Remote = require('../../Storages/AdminAjaxRemoteStorage.js')
Remote = require('Storage:Admin:Remote')
;
_.delay(function () {

28
dev/Settings/Admin/AdminSettingsContacts.js
View file

@ -11,7 +11,7 @@
Enums = require('Enums'),
Utils = require('Utils'),
AppSettings = require('../../Storages/AppSettings.js')
Settings = require('Storage:Settings')
;
/**
@ -20,13 +20,13 @@
function AdminSettingsContacts()
{
var
Remote = require('../../Storages/AdminAjaxRemoteStorage.js')
Remote = require('Storage:Admin:Remote')
;
this.defautOptionsAfterRender = Utils.defautOptionsAfterRender;
this.enableContacts = ko.observable(!!AppSettings.settingsGet('ContactsEnable'));
this.contactsSharing = ko.observable(!!AppSettings.settingsGet('ContactsSharing'));
this.contactsSync = ko.observable(!!AppSettings.settingsGet('ContactsSync'));
this.enableContacts = ko.observable(!!Settings.settingsGet('ContactsEnable'));
this.contactsSharing = ko.observable(!!Settings.settingsGet('ContactsSharing'));
this.contactsSync = ko.observable(!!Settings.settingsGet('ContactsSync'));
var
aTypes = ['sqlite', 'mysql', 'pgsql'],
@ -49,15 +49,15 @@
}
;
if (!!AppSettings.settingsGet('SQLiteIsSupported'))
if (!!Settings.settingsGet('SQLiteIsSupported'))
{
aSupportedTypes.push('sqlite');
}
if (!!AppSettings.settingsGet('MySqlIsSupported'))
if (!!Settings.settingsGet('MySqlIsSupported'))
{
aSupportedTypes.push('mysql');
}
if (!!AppSettings.settingsGet('PostgreSqlIsSupported'))
if (!!Settings.settingsGet('PostgreSqlIsSupported'))
{
aSupportedTypes.push('pgsql');
}
@ -105,9 +105,9 @@
this.testContactsErrorMessage('');
}, this);
this.pdoDsn = ko.observable(AppSettings.settingsGet('ContactsPdoDsn'));
this.pdoUser = ko.observable(AppSettings.settingsGet('ContactsPdoUser'));
this.pdoPassword = ko.observable(AppSettings.settingsGet('ContactsPdoPassword'));
this.pdoDsn = ko.observable(Settings.settingsGet('ContactsPdoDsn'));
this.pdoUser = ko.observable(Settings.settingsGet('ContactsPdoUser'));
this.pdoPassword = ko.observable(Settings.settingsGet('ContactsPdoPassword'));
this.pdoDsnTrigger = ko.observable(Enums.SaveSettingsStep.Idle);
this.pdoUserTrigger = ko.observable(Enums.SaveSettingsStep.Idle);
@ -137,7 +137,7 @@
return '' !== this.pdoDsn() && '' !== this.pdoUser();
});
this.contactsType(AppSettings.settingsGet('ContactsPdoType'));
this.contactsType(Settings.settingsGet('ContactsPdoType'));
this.onTestContactsResponse = _.bind(this.onTestContactsResponse, this);
}
@ -179,7 +179,7 @@
{
var
self = this,
Remote = require('../../Storages/AdminAjaxRemoteStorage.js')
Remote = require('Storage:Admin:Remote')
;
_.delay(function () {
@ -233,7 +233,7 @@
});
});
self.contactsType(AppSettings.settingsGet('ContactsPdoType'));
self.contactsType(Settings.settingsGet('ContactsPdoType'));
}, 50);
};

14
dev/Settings/Admin/AdminSettingsDomains.js
View file

@ -11,10 +11,10 @@
Enums = require('Enums'),
PopupsDomainViewModel = require('../../ViewModels/Popups/PopupsDomainViewModel.js'),
PopupsDomainViewModel = require('View:Popup:Domain'),
Data = require('../../Storages/AdminDataStorage.js'),
Remote = require('../../Storages/AdminAjaxRemoteStorage.js')
Data = require('Storage:Admin:Data'),
Remote = require('Storage:Admin:Remote')
;
/**
@ -58,7 +58,7 @@
AdminSettingsDomains.prototype.createDomain = function ()
{
require('kn').showScreenPopup(PopupsDomainViewModel);
require('App:Knoin').showScreenPopup(PopupsDomainViewModel);
};
AdminSettingsDomains.prototype.deleteDomain = function (oDomain)
@ -86,20 +86,20 @@
})
;
require('../../Apps/AdminApp.js').reloadDomainList();
require('App:Admin').reloadDomainList();
};
AdminSettingsDomains.prototype.onDomainLoadRequest = function (sResult, oData)
{
if (Enums.StorageResultType.Success === sResult && oData && oData.Result)
{
require('kn').showScreenPopup(PopupsDomainViewModel, [oData.Result]);
require('App:Knoin').showScreenPopup(PopupsDomainViewModel, [oData.Result]);
}
};
AdminSettingsDomains.prototype.onDomainListChangeRequest = function ()
{
require('../../Apps/AdminApp.js').reloadDomainList();
require('App:Admin').reloadDomainList();
};
module.exports = AdminSettingsDomains;

16
dev/Settings/Admin/AdminSettingsGeneral.js
View file

@ -12,10 +12,8 @@
Utils = require('Utils'),
LinkBuilder = require('LinkBuilder'),
AppSettings = require('../../Storages/AppSettings.js'),
Data = require('../../Storages/AdminDataStorage.js'),
PopupsLanguagesViewModel = require('../../ViewModels/Popups/PopupsLanguagesViewModel.js')
Settings = require('Storage:Settings'),
Data = require('Storage:Admin:Data')
;
/**
@ -35,8 +33,8 @@
this.capaAdditionalAccounts = Data.capaAdditionalAccounts;
this.capaAdditionalIdentities = Data.capaAdditionalIdentities;
this.mainAttachmentLimit = ko.observable(Utils.pInt(AppSettings.settingsGet('AttachmentLimit')) / (1024 * 1024)).extend({'posInterer': 25});
this.uploadData = AppSettings.settingsGet('PhpUploadSizes');
this.mainAttachmentLimit = ko.observable(Utils.pInt(Settings.settingsGet('AttachmentLimit')) / (1024 * 1024)).extend({'posInterer': 25});
this.uploadData = Settings.settingsGet('PhpUploadSizes');
this.uploadDataDesc = this.uploadData && (this.uploadData['upload_max_filesize'] || this.uploadData['post_max_size']) ?
[
this.uploadData['upload_max_filesize'] ? 'upload_max_filesize = ' + this.uploadData['upload_max_filesize'] + '; ' : '',
@ -57,7 +55,7 @@
return Utils.convertLangName(this.mainLanguage());
}, this);
this.weakPassword = !!AppSettings.settingsGet('WeakPassword');
this.weakPassword = !!Settings.settingsGet('WeakPassword');
this.attachmentLimitTrigger = ko.observable(Enums.SaveSettingsStep.Idle);
this.languageTrigger = ko.observable(Enums.SaveSettingsStep.Idle);
@ -68,7 +66,7 @@
{
var
self = this,
Remote = require('../../Storages/AdminAjaxRemoteStorage.js')
Remote = require('Storage:Admin:Remote')
;
_.delay(function () {
@ -132,7 +130,7 @@
AdminSettingsGeneral.prototype.selectLanguage = function ()
{
require('kn').showScreenPopup(PopupsLanguagesViewModel);
require('App:Knoin').showScreenPopup(require('View:Popup:Languages'));
};
/**

16
dev/Settings/Admin/AdminSettingsLicensing.js
View file

@ -8,10 +8,8 @@
ko = require('ko'),
moment = require('moment'),
AppSettings = require('../../Storages/AppSettings.js'),
Data = require('../../Storages/AdminDataStorage.js'),
PopupsActivateViewModel = require('../../ViewModels/Popups/PopupsActivateViewModel.js')
Settings = require('Storage:Settings'),
Data = require('Storage:Admin:Data')
;
/**
@ -27,12 +25,12 @@
this.licenseTrigger = Data.licenseTrigger;
this.adminDomain = ko.observable('');
this.subscriptionEnabled = ko.observable(!!AppSettings.settingsGet('SubscriptionEnabled'));
this.subscriptionEnabled = ko.observable(!!Settings.settingsGet('SubscriptionEnabled'));
this.licenseTrigger.subscribe(function () {
if (this.subscriptionEnabled())
{
require('../../Apps/AdminApp.js').reloadLicensing(true);
require('App:Admin').reloadLicensing(true);
}
}, this);
}
@ -41,18 +39,18 @@
{
if (this.subscriptionEnabled())
{
require('../../Apps/AdminApp.js').reloadLicensing(false);
require('App:Admin').reloadLicensing(false);
}
};
AdminSettingsLicensing.prototype.onShow = function ()
{
this.adminDomain(AppSettings.settingsGet('AdminDomain'));
this.adminDomain(Settings.settingsGet('AdminDomain'));
};
AdminSettingsLicensing.prototype.showActivationForm = function ()
{
require('kn').showScreenPopup(PopupsActivateViewModel);
require('App:Knoin').showScreenPopup(require('View:Popup:Activate'));
};
/**

8
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')
Settings = require('Storage:Settings'),
Data = require('Storage:Admin:Data')
;
/**
@ -23,7 +23,7 @@
this.determineUserLanguage = Data.determineUserLanguage;
this.determineUserDomain = Data.determineUserDomain;
this.defaultDomain = ko.observable(AppSettings.settingsGet('LoginDefaultDomain'));
this.defaultDomain = ko.observable(Settings.settingsGet('LoginDefaultDomain'));
this.allowLanguagesOnLogin = Data.allowLanguagesOnLogin;
this.defaultDomainTrigger = ko.observable(Enums.SaveSettingsStep.Idle);
@ -33,7 +33,7 @@
{
var
self = this,
Remote = require('../../Storages/AdminAjaxRemoteStorage.js')
Remote = require('Storage:Admin:Remote')
;
_.delay(function () {

8
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('Storage:Admin:Data'),
Remote = require('Storage:Admin:Remote')
;
/**
@ -51,7 +51,7 @@
AdminSettingsPackages.prototype.onBuild = function ()
{
require('../../Apps/AdminApp.js').reloadPackagesList();
require('App:Admin').reloadPackagesList();
};
AdminSettingsPackages.prototype.requestHelper = function (oPackage, bInstall)
@ -86,7 +86,7 @@
}
else
{
require('../../Apps/AdminApp.js').reloadPackagesList();
require('App:Admin').reloadPackagesList();
}
};
};

16
dev/Settings/Admin/AdminSettingsPlugins.js
View file

@ -11,11 +11,9 @@
Enums = require('Enums'),
Utils = require('Utils'),
AppSettings = require('../../Storages/AppSettings.js'),
Data = require('../../Storages/AdminDataStorage.js'),
Remote = require('../../Storages/AdminAjaxRemoteStorage.js'),
PopupsPluginViewModel = require('../../ViewModels/Popups/PopupsPluginViewModel.js')
Settings = require('Storage:Settings'),
Data = require('Storage:Admin:Data'),
Remote = require('Storage:Admin:Remote')
;
/**
@ -23,7 +21,7 @@
*/
function AdminSettingsPlugins()
{
this.enabledPlugins = ko.observable(!!AppSettings.settingsGet('EnabledPlugins'));
this.enabledPlugins = ko.observable(!!Settings.settingsGet('EnabledPlugins'));
this.pluginsError = ko.observable('');
@ -80,14 +78,14 @@
AdminSettingsPlugins.prototype.onShow = function ()
{
this.pluginsError('');
require('../../Apps/AdminApp.js').reloadPluginList();
require('App:Admin').reloadPluginList();
};
AdminSettingsPlugins.prototype.onPluginLoadRequest = function (sResult, oData)
{
if (Enums.StorageResultType.Success === sResult && oData && oData.Result)
{
require('kn').showScreenPopup(PopupsPluginViewModel, [oData.Result]);
require('App:Knoin').showScreenPopup(require('View:Popup:Plugin'), [oData.Result]);
}
};
@ -108,7 +106,7 @@
}
}
require('../../Apps/AdminApp.js').reloadPluginList();
require('App:Admin').reloadPluginList();
};
module.exports = AdminSettingsPlugins;

14
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')
Settings = require('Storage:Settings'),
Data = require('Storage:Admin:Data'),
Remote = require('Storage:Admin:Remote')
;
/**
@ -24,10 +24,10 @@
{
this.useLocalProxyForExternalImages = Data.useLocalProxyForExternalImages;
this.capaOpenPGP = ko.observable(AppSettings.capa(Enums.Capa.OpenPGP));
this.capaTwoFactorAuth = ko.observable(AppSettings.capa(Enums.Capa.TwoFactor));
this.capaOpenPGP = ko.observable(Settings.capa(Enums.Capa.OpenPGP));
this.capaTwoFactorAuth = ko.observable(Settings.capa(Enums.Capa.TwoFactor));
this.adminLogin = ko.observable(AppSettings.settingsGet('AdminLogin'));
this.adminLogin = ko.observable(Settings.settingsGet('AdminLogin'));
this.adminPassword = ko.observable('');
this.adminPasswordNew = ko.observable('');
this.adminPasswordNew2 = ko.observable('');
@ -95,7 +95,7 @@
AdminSettingsSecurity.prototype.onBuild = function ()
{
var
Remote = require('../../Storages/AdminAjaxRemoteStorage.js')
Remote = require('Storage:Admin:Remote')
;
this.capaOpenPGP.subscribe(function (bValue) {

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

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

13
dev/Settings/App/SettingsAccounts.js
View file

@ -13,11 +13,8 @@
Utils = require('Utils'),
LinkBuilder = require('LinkBuilder'),
Data = require('../../Storages/WebMailDataStorage.js'),
Remote = require('../../Storages/WebMailAjaxRemoteStorage.js'),
kn = require('kn'),
PopupsAddAccountViewModel = require('../../ViewModels/Popups/PopupsAddAccountViewModel.js')
Data = require('Storage:RainLoop:Data'),
Remote = require('Storage:RainLoop:Remote')
;
/**
@ -52,7 +49,7 @@
SettingsAccounts.prototype.addNewAccount = function ()
{
kn.showScreenPopup(PopupsAddAccountViewModel);
require('App:Knoin').showScreenPopup(require('View:Popup:AddAccount'));
};
/**
@ -65,7 +62,7 @@
this.accountForDeletion(null);
var
App = require('../../Apps/RainLoopApp.js'),
kn = require('App:Knoin'),
fRemoveAccount = function (oAccount) {
return oAccountToRemove === oAccount;
}
@ -90,7 +87,7 @@
}
else
{
App.accountsAndIdentities();
require('App:RainLoop').accountsAndIdentities();
}
}, oAccountToRemove.email);

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

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

4
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('Storage:RainLoop:Remote'),
Data = require('Storage:RainLoop:Data')
;
/**

7
dev/Settings/App/SettingsFilters.js
View file

@ -30,12 +30,11 @@
SettingsFilters.prototype.addFilter = function ()
{
var
kn = require('kn'),
FilterModel = require('../../Models/FilterModel.js'),
PopupsFilterViewModel = require('../../ViewModels/Popups/PopupsFilterViewModel.js')
FilterModel = require('Model:Filter')
;
kn.showScreenPopup(PopupsFilterViewModel, [new FilterModel()]);
require('App:Knoin').showScreenPopup(
require('View:Popup:Filter'), [new FilterModel()]);
};
module.exports = SettingsFilters;

27
dev/Settings/App/SettingsFolders.js
View file

@ -10,16 +10,11 @@
Enums = require('Enums'),
Utils = require('Utils'),
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'),
PopupsFolderCreateViewModel = require('../../ViewModels/Popups/PopupsFolderCreateViewModel.js'),
PopupsFolderSystemViewModel = require('../../ViewModels/Popups/PopupsFolderSystemViewModel.js')
Settings = require('Storage:Settings'),
LocalStorage = require('Storage:LocalStorage'),
Data = require('Storage:RainLoop:Data'),
Cache = require('Storage:RainLoop:Cache'),
Remote = require('Storage:RainLoop:Remote')
;
/**
@ -92,13 +87,12 @@
}
]});
this.useImapSubscribe = !!AppSettings.settingsGet('UseImapSubscribe');
this.useImapSubscribe = !!Settings.settingsGet('UseImapSubscribe');
}
SettingsFolders.prototype.folderEditOnEnter = function (oFolder)
{
var
App = require('../../Apps/RainLoopApp.js'),
sEditName = oFolder ? Utils.trim(oFolder.nameForEdit()) : ''
;
@ -116,7 +110,7 @@
oData && oData.ErrorCode ? Utils.getNotification(oData.ErrorCode) : Utils.i18n('NOTIFICATIONS/CANT_RENAME_FOLDER'));
}
App.folders();
require('App:RainLoop').folders();
}, oFolder.fullNameRaw, sEditName);
@ -143,12 +137,12 @@
SettingsFolders.prototype.createFolder = function ()
{
kn.showScreenPopup(PopupsFolderCreateViewModel);
require('App:Knoin').showScreenPopup(require('View:Popup:FolderCreate'));
};
SettingsFolders.prototype.systemFolder = function ()
{
kn.showScreenPopup(PopupsFolderSystemViewModel);
require('App:Knoin').showScreenPopup(require('View:Popup:FolderSystem'));
};
SettingsFolders.prototype.deleteFolder = function (oFolderToRemove)
@ -159,7 +153,6 @@
this.folderForDeletion(null);
var
App = require('../../Apps/RainLoopApp.js'),
fRemoveFolder = function (oFolder) {
if (oFolderToRemove === oFolder)
@ -188,7 +181,7 @@
oData && oData.ErrorCode ? Utils.getNotification(oData.ErrorCode) : Utils.i18n('NOTIFICATIONS/CANT_DELETE_FOLDER'));
}
App.folders();
require('App:RainLoop').folders();
}, oFolderToRemove.fullNameRaw);

9
dev/Settings/App/SettingsGeneral.js
View file

@ -15,11 +15,8 @@
Utils = require('Utils'),
LinkBuilder = require('LinkBuilder'),
Data = require('../../Storages/WebMailDataStorage.js'),
Remote = require('../../Storages/WebMailAjaxRemoteStorage.js'),
kn = require('kn'),
PopupsLanguagesViewModel = require('../../ViewModels/Popups/PopupsLanguagesViewModel.js')
Data = require('Storage:RainLoop:Data'),
Remote = require('Storage:RainLoop:Remote')
;
/**
@ -174,7 +171,7 @@
SettingsGeneral.prototype.selectLanguage = function ()
{
kn.showScreenPopup(PopupsLanguagesViewModel);
require('App:Knoin').showScreenPopup(require('View:Popup:Languages'));
};
module.exports = SettingsGeneral;

18
dev/Settings/App/SettingsIdentities.js
View file

@ -10,13 +10,10 @@
Enums = require('Enums'),
Utils = require('Utils'),
NewHtmlEditorWrapper = require('NewHtmlEditorWrapper'),
HtmlEditor = require('HtmlEditor'),
Data = require('../../Storages/WebMailDataStorage.js'),
Remote = require('../../Storages/WebMailAjaxRemoteStorage.js'),
kn = require('kn'),
PopupsIdentityViewModel = require('../../ViewModels/Popups/PopupsIdentityViewModel.js')
Data = require('Storage:RainLoop:Data'),
Remote = require('Storage:RainLoop:Remote')
;
/**
@ -116,12 +113,12 @@
SettingsIdentities.prototype.addNewIdentity = function ()
{
kn.showScreenPopup(PopupsIdentityViewModel);
require('App:Knoin').showScreenPopup(require('View:Popup:Identity'));
};
SettingsIdentities.prototype.editIdentity = function (oIdentity)
{
kn.showScreenPopup(PopupsIdentityViewModel, [oIdentity]);
require('App:Knoin').showScreenPopup(require('View:Popup:Identity'), [oIdentity]);
};
/**
@ -134,7 +131,6 @@
this.identityForDeletion(null);
var
App = require('../../Apps/RainLoopApp.js'),
fRemoveFolder = function (oIdentity) {
return oIdentityToRemove === oIdentity;
}
@ -145,7 +141,7 @@
this.identities.remove(fRemoveFolder);
Remote.identityDelete(function () {
App.accountsAndIdentities();
require('App:RainLoop').accountsAndIdentities();
}, oIdentityToRemove.id);
}
}
@ -160,7 +156,7 @@
sSignature = Data.signature()
;
this.editor = new NewHtmlEditorWrapper(self.signatureDom(), function () {
this.editor = new HtmlEditor(self.signatureDom(), function () {
Data.signature(
(self.editor.isHtml() ? ':HTML:' : '') + self.editor.getData()
);

8
dev/Settings/App/SettingsIdentity.js
View file

@ -10,10 +10,10 @@
Enums = require('Enums'),
Utils = require('Utils'),
NewHtmlEditorWrapper = require('NewHtmlEditorWrapper'),
HtmlEditor = require('HtmlEditor'),
Data = require('../../Storages/WebMailDataStorage.js'),
Remote = require('../../Storages/WebMailAjaxRemoteStorage.js')
Data = require('Storage:RainLoop:Data'),
Remote = require('Storage:RainLoop:Remote')
;
/**
@ -44,7 +44,7 @@
sSignature = Data.signature()
;
this.editor = new NewHtmlEditorWrapper(self.signatureDom(), function () {
this.editor = new HtmlEditor(self.signatureDom(), function () {
Data.signature(
(self.editor.isHtml() ? ':HTML:' : '') + self.editor.getData()
);

19
dev/Settings/App/SettingsOpenPGP.js
View file

@ -6,14 +6,8 @@
var
ko = require('ko'),
kn = require('kn'),
Data = require('../../Storages/WebMailDataStorage.js'),
PopupsAddOpenPgpKeyViewModel = require('../../ViewModels/Popups/PopupsAddOpenPgpKeyViewModel.js'),
PopupsGenerateNewOpenPgpKeyViewModel = require('../../ViewModels/Popups/PopupsGenerateNewOpenPgpKeyViewModel.js'),
PopupsViewOpenPgpKeyViewModel = require('../../ViewModels/Popups/PopupsViewOpenPgpKeyViewModel.js')
kn = require('App:Knoin'),
Data = require('Storage:RainLoop:Data')
;
/**
@ -42,19 +36,19 @@
SettingsOpenPGP.prototype.addOpenPgpKey = function ()
{
kn.showScreenPopup(PopupsAddOpenPgpKeyViewModel);
kn.showScreenPopup(require('View:Popup:AddOpenPgpKey'));
};
SettingsOpenPGP.prototype.generateOpenPgpKey = function ()
{
kn.showScreenPopup(PopupsGenerateNewOpenPgpKeyViewModel);
kn.showScreenPopup(require('View:Popup:NewOpenPgpKey'));
};
SettingsOpenPGP.prototype.viewOpenPgpKey = function (oOpenPgpKey)
{
if (oOpenPgpKey)
{
kn.showScreenPopup(PopupsViewOpenPgpKeyViewModel, [oOpenPgpKey]);
kn.showScreenPopup(require('View:Popup:ViewOpenPgpKey'), [oOpenPgpKey]);
}
};
@ -78,8 +72,7 @@
Data.openpgpKeyring.store();
var App = require('../../Apps/RainLoopApp.js');
App.reloadOpenPgpKeys();
require('App:RainLoop').reloadOpenPgpKeys();
}
}
};

7
dev/Settings/App/SettingsSecurity.js
View file

@ -11,10 +11,7 @@
Globals = require('Globals'),
Utils = require('Utils'),
Remote = require('../../Storages/WebMailAjaxRemoteStorage.js'),
kn = require('kn'),
PopupsTwoFactorTestViewModel = require('../../ViewModels/Popups/PopupsTwoFactorTestViewModel.js')
Remote = require('Storage:RainLoop:Remote')
;
/**
@ -77,7 +74,7 @@
SettingsSecurity.prototype.testTwoFactor = function ()
{
kn.showScreenPopup(PopupsTwoFactorTestViewModel);
require('App:Knoin').showScreenPopup(require('View:Popup:TwoFactorTest'));
};
SettingsSecurity.prototype.clearTwoFactor = function ()

15
dev/Settings/App/SettingsSocial.js
View file

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

4
dev/Settings/App/SettingsThemes.js
View file

@ -14,8 +14,8 @@
Utils = require('Utils'),
LinkBuilder = require('LinkBuilder'),
Data = require('../../Storages/WebMailDataStorage.js'),
Remote = require('../../Storages/WebMailAjaxRemoteStorage.js')
Data = require('Storage:RainLoop:Data'),
Remote = require('Storage:RainLoop:Remote')
;
/**