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

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)