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

Code refactoring

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

4
dev/View/Popup/AddAccount.js
View file

@ -10,7 +10,7 @@
Enums = require('Common/Enums'),
Utils = require('Common/Utils'),
Remote = require('Storage/App/Remote'),
Remote = require('Storage/User/Remote'),
kn = require('Knoin/Knoin'),
AbstractView = require('Knoin/AbstractView')
@ -62,7 +62,7 @@
{
if (oData.Result)
{
require('App/App').accountsAndIdentities();
require('App/User').accountsAndIdentities();
this.cancelCommand();
}
else if (oData.ErrorCode)

4
dev/View/Popup/AddOpenPgpKey.js
View file

@ -9,7 +9,7 @@
Utils = require('Common/Utils'),
Data = require('Storage/App/Data'),
Data = require('Storage/User/Data'),
kn = require('Knoin/Knoin'),
AbstractView = require('Knoin/AbstractView')
@ -77,7 +77,7 @@
oOpenpgpKeyring.store();
require('App/App').reloadOpenPgpKeys();
require('App/User').reloadOpenPgpKeys();
Utils.delegateRun(this, 'cancelCommand');
return true;

2
dev/View/Popup/AdvancedSearch.js
View file

@ -10,7 +10,7 @@
Utils = require('Common/Utils'),
Data = require('Storage/App/Data'),
Data = require('Storage/User/Data'),
kn = require('Knoin/Knoin'),
AbstractView = require('Knoin/AbstractView')

16
dev/View/Popup/Compose.js
View file

@ -21,9 +21,9 @@
HtmlEditor = require('Common/HtmlEditor'),
Settings = require('Storage/Settings'),
Data = require('Storage/App/Data'),
Cache = require('Storage/App/Cache'),
Remote = require('Storage/App/Remote'),
Data = require('Storage/User/Data'),
Cache = require('Storage/User/Cache'),
Remote = require('Storage/User/Remote'),
ComposeAttachmentModel = require('Model/ComposeAttachment'),
@ -211,7 +211,7 @@
this.deleteCommand = Utils.createCommand(this, function () {
require('App/App').deleteMessagesFromFolderWithoutCheck(this.draftFolder(), [this.draftUid()]);
require('App/User').deleteMessagesFromFolderWithoutCheck(this.draftFolder(), [this.draftUid()]);
kn.hideScreenPopup(ComposePopupView);
}, function () {
@ -270,7 +270,7 @@
}
Cache.setMessageFlagsToCache(this.aDraftInfo[2], this.aDraftInfo[1], aFlagsCache);
require('App/App').reloadFlagsCurrentMessageListAndMessageFromCache();
require('App/User').reloadFlagsCurrentMessageListAndMessageFromCache();
Cache.setFolderHash(this.aDraftInfo[2], '');
}
}
@ -408,7 +408,7 @@
ComposePopupView.prototype.emailsSource = function (oData, fResponse)
{
require('App/App').getAutocomplete(oData.term, function (aData) {
require('App/User').getAutocomplete(oData.term, function (aData) {
fResponse(_.map(aData, function (oEmailItem) {
return oEmailItem.toLine(false);
}));
@ -446,11 +446,11 @@
Cache.setFolderHash(sDraftFolder, '');
if (Data.currentFolderFullNameRaw() === sDraftFolder)
{
require('App/App').reloadMessageList(true);
require('App/User').reloadMessageList(true);
}
else
{
require('App/App').folderInformation(sDraftFolder);
require('App/User').folderInformation(sDraftFolder);
}
}
};

2
dev/View/Popup/ComposeOpenPgp.js
View file

@ -11,7 +11,7 @@
Utils = require('Common/Utils'),
Enums = require('Common/Enums'),
Data = require('Storage/App/Data'),
Data = require('Storage/User/Data'),
EmailModel = require('Model/Email'),

10
dev/View/Popup/Contacts.js
View file

@ -17,8 +17,8 @@
Selector = require('Common/Selector'),
Links = require('Common/Links'),
Data = require('Storage/App/Data'),
Remote = require('Storage/App/Remote'),
Data = require('Storage/User/Data'),
Remote = require('Storage/User/Remote'),
EmailModel = require('Model/Email'),
ContactModel = require('Model/Contact'),
@ -333,7 +333,7 @@
this.syncCommand = Utils.createCommand(this, function () {
var self = this;
require('App/App').contactsSync(function (sResult, oData) {
require('App/User').contactsSync(function (sResult, oData) {
if (Enums.StorageResultType.Success !== sResult || !oData || !oData.Result)
{
window.alert(Utils.getNotification(
@ -447,12 +447,12 @@
ContactsPopupView.prototype.exportVcf = function ()
{
require('App/App').download(Links.exportContactsVcf());
require('App/User').download(Links.exportContactsVcf());
};
ContactsPopupView.prototype.exportCsv = function ()
{
require('App/App').download(Links.exportContactsCsv());
require('App/User').download(Links.exportContactsCsv());
};
ContactsPopupView.prototype.initUploader = function ()

2
dev/View/Popup/Filter.js
View file

@ -10,7 +10,7 @@
Consts = require('Common/Consts'),
Utils = require('Common/Utils'),
Data = require('Storage/App/Data'),
Data = require('Storage/User/Data'),
kn = require('Knoin/Knoin'),
AbstractView = require('Knoin/AbstractView')

8
dev/View/Popup/FolderClear.js
View file

@ -10,9 +10,9 @@
Enums = require('Common/Enums'),
Utils = require('Common/Utils'),
Data = require('Storage/App/Data'),
Cache = require('Storage/App/Cache'),
Remote = require('Storage/App/Remote'),
Data = require('Storage/User/Data'),
Cache = require('Storage/User/Cache'),
Remote = require('Storage/User/Remote'),
kn = require('Knoin/Knoin'),
AbstractView = require('Knoin/AbstractView')
@ -70,7 +70,7 @@
self.clearingProcess(false);
if (Enums.StorageResultType.Success === sResult && oData && oData.Result)
{
require('App/App').reloadMessageList(true);
require('App/User').reloadMessageList(true);
self.cancelCommand();
}
else

6
dev/View/Popup/FolderCreate.js
View file

@ -11,8 +11,8 @@
Consts = require('Common/Consts'),
Utils = require('Common/Utils'),
Data = require('Storage/App/Data'),
Remote = require('Storage/App/Remote'),
Data = require('Storage/User/Data'),
Remote = require('Storage/User/Remote'),
kn = require('Knoin/Knoin'),
AbstractView = require('Knoin/AbstractView')
@ -79,7 +79,7 @@
Data.foldersCreating(false);
if (Enums.StorageResultType.Success === sResult && oData && oData.Result)
{
require('App/App').folders();
require('App/User').folders();
}
else
{

4
dev/View/Popup/FolderSystem.js
View file

@ -12,8 +12,8 @@
Utils = require('Common/Utils'),
Settings = require('Storage/Settings'),
Data = require('Storage/App/Data'),
Remote = require('Storage/App/Remote'),
Data = require('Storage/User/Data'),
Remote = require('Storage/User/Remote'),
kn = require('Knoin/Knoin'),
AbstractView = require('Knoin/AbstractView')

6
dev/View/Popup/Identity.js
View file

@ -10,8 +10,8 @@
Enums = require('Common/Enums'),
Utils = require('Common/Utils'),
Remote = require('Storage/App/Remote'),
Data = require('Storage/App/Data'),
Remote = require('Storage/User/Remote'),
Data = require('Storage/User/Data'),
kn = require('Knoin/Knoin'),
AbstractView = require('Knoin/AbstractView')
@ -83,7 +83,7 @@
{
if (oData.Result)
{
require('App/App').accountsAndIdentities();
require('App/User').accountsAndIdentities();
this.cancelCommand();
}
else if (oData.ErrorCode)

4
dev/View/Popup/NewOpenPgpKey.js
View file

@ -9,7 +9,7 @@
Utils = require('Common/Utils'),
Data = require('Storage/App/Data'),
Data = require('Storage/User/Data'),
kn = require('Knoin/Knoin'),
AbstractView = require('Knoin/AbstractView')
@ -74,7 +74,7 @@
oOpenpgpKeyring.publicKeys.importKey(mKeyPair.publicKeyArmored);
oOpenpgpKeyring.store();
require('App/App').reloadOpenPgpKeys();
require('App/User').reloadOpenPgpKeys();
Utils.delegateRun(self, 'cancelCommand');
}

2
dev/View/Popup/TwoFactorTest.js
View file

@ -10,7 +10,7 @@
Enums = require('Common/Enums'),
Utils = require('Common/Utils'),
Remote = require('Storage/App/Remote'),
Remote = require('Storage/User/Remote'),
kn = require('Knoin/Knoin'),
AbstractView = require('Knoin/AbstractView')