Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-08-31 21:19:21 +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

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')
;
/**