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

Code refactoring

Browse source
This commit is contained in:
RainLoop Team 2015-02-22 02:00:51 +04:00
parent bf56821c2d
commit 31860420cb
32 changed files with 1342 additions and 1282 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -10,7 +10,7 @@
Utils = require('Common/Utils'),
Data = require('Storage/User/Data'),
MessageStore = require('Stores/User/Message'),
kn = require('Knoin/Knoin'),
AbstractView = require('Knoin/AbstractView')
@ -41,7 +41,7 @@
var sSearch = this.buildSearchString();
if ('' !== sSearch)
{
Data.mainMessageListSearch(sSearch);
MessageStore.mainMessageListSearch(sSearch);
}
this.cancelCommand();

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

@ -27,10 +27,10 @@
AccountStore = require('Stores/User/Account'),
FolderStore = require('Stores/User/Folder'),
PgpStore = require('Stores/User/Pgp'),
MessageStore = require('Stores/User/Message'),
SocialStore = require('Stores/Social'),
Settings = require('Storage/Settings'),
Data = require('Storage/User/Data'),
Cache = require('Storage/User/Cache'),
Remote = require('Storage/User/Remote'),
@ -87,7 +87,7 @@
this.allowContacts = !!AppStore.contactsIsAllowed();
this.bSkipNextHide = false;
this.composeInEdit = Data.composeInEdit;
this.composeInEdit = AppStore.composeInEdit;
this.editorDefaultType = SettingsStore.editorDefaultType;
this.capaOpenPGP = PgpStore.capaOpenPGP;
@ -433,8 +433,6 @@
var self = this;
window.console.log(this.sLastFocusedField);
_.delay(function () {
kn.showScreenPopup(require('View/Popup/Contacts'),
[true, self.sLastFocusedField]);
@ -578,7 +576,7 @@
if ('' !== sDraftFolder)
{
Cache.setFolderHash(sDraftFolder, '');
if (Data.currentFolderFullNameRaw() === sDraftFolder)
if (FolderStore.currentFolderFullNameRaw() === sDraftFolder)
{
require('App/User').reloadMessageList(true);
}
@ -701,10 +699,10 @@
if (this.bFromDraft)
{
oMessage = Data.message();
oMessage = MessageStore.message();
if (oMessage && this.draftFolder() === oMessage.folderFullNameRaw && this.draftUid() === oMessage.uid)
{
Data.message(null);
MessageStore.message(null);
}
}
@ -741,7 +739,7 @@
if (!this.bSkipNextHide)
{
this.composeInEdit(false);
AppStore.composeInEdit(false);
this.reset();
}
@ -883,7 +881,7 @@
this.autosaveStart();
if (this.composeInEdit())
if (AppStore.composeInEdit())
{
sType = sType || Enums.ComposeType.Empty;
@ -969,7 +967,7 @@
ComposePopupView.prototype.initOnShow = function (sType, oMessageOrArray,
aToEmails, aCcEmails, aBccEmails, sCustomSubject, sCustomPlainText)
{
this.composeInEdit(true);
AppStore.composeInEdit(true);
var
self = this,

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

@ -12,7 +12,6 @@
Enums = require('Common/Enums'),
Translator = require('Common/Translator'),
Data = require('Storage/User/Data'),
PgpStore = require('Stores/User/Pgp'),
EmailModel = require('Model/Email'),
@ -66,7 +65,7 @@
if (bResult && this.sign())
{
oPrivateKey = Data.findPrivateKeyByEmail(this.from(), this.password());
oPrivateKey = PgpStore.findPrivateKeyByEmail(this.from(), this.password());
if (!oPrivateKey)
{
this.notification(Translator.i18n('PGP_NOTIFICATIONS/NO_PRIVATE_KEY_FOUND_FOR', {
@ -87,7 +86,7 @@
{
aPublicKeys = [];
_.each(this.to(), function (sEmail) {
var aKeys = Data.findPublicKeysByEmail(sEmail);
var aKeys = PgpStore.findPublicKeysByEmail(sEmail);
if (0 === aKeys.length && bResult)
{
self.notification(Translator.i18n('PGP_NOTIFICATIONS/NO_PUBLIC_KEYS_FOUND_FOR', {

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

@ -19,8 +19,8 @@
Translator = require('Common/Translator'),
SettingsStore = require('Stores/User/Settings'),
ContactStore = require('Stores/User/Contact'),
Data = require('Storage/User/Data'),
Remote = require('Storage/User/Remote'),
EmailModel = require('Model/Email'),
@ -52,13 +52,13 @@
this.bBackToCompose = false;
this.sLastComposeFocusedField = '';
this.allowContactsSync = Data.allowContactsSync;
this.enableContactsSync = Data.enableContactsSync;
this.allowContactsSync = ContactStore.allowContactsSync;
this.enableContactsSync = ContactStore.enableContactsSync;
this.allowExport = !Globals.bMobileDevice;
this.search = ko.observable('');
this.contactsCount = ko.observable(0);
this.contacts = Data.contacts;
this.contacts = ContactStore.contacts;
this.currentContact = ko.observable(null);

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

@ -12,9 +12,8 @@
Utils = require('Common/Utils'),
Translator = require('Common/Translator'),
Data = require('Storage/User/Data'),
FilterStore = require('Stores/User/Filter'),
FolderStore = require('Stores/User/Folder'),
kn = require('Knoin/Knoin'),
AbstractView = require('Knoin/AbstractView')
@ -38,7 +37,7 @@
this.allowMarkAsRead = ko.observable(false);
this.defautOptionsAfterRender = Utils.defautOptionsAfterRender;
this.folderSelectList = Data.folderMenuForFilters;
this.folderSelectList = FolderStore.folderMenuForFilters;
this.selectedFolderValue = ko.observable('');
this.selectedFolderValue.subscribe(function() {

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

@ -11,7 +11,8 @@
Utils = require('Common/Utils'),
Translator = require('Common/Translator'),
Data = require('Storage/User/Data'),
MessageStore = require('Stores/User/Message'),
Cache = require('Storage/User/Cache'),
Remote = require('Storage/User/Remote'),
@ -56,8 +57,8 @@
if (oFolderToClear)
{
Data.message(null);
Data.messageList([]);
MessageStore.message(null);
MessageStore.messageList([]);
this.clearingProcess(true);

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

@ -13,7 +13,8 @@
Utils = require('Common/Utils'),
Translator = require('Common/Translator'),
Data = require('Storage/User/Data'),
FolderStore = require('Stores/User/Folder'),
Remote = require('Storage/User/Remote'),
kn = require('Knoin/Knoin'),
@ -43,7 +44,7 @@
aTop = [],
fDisableCallback = null,
fVisibleCallback = null,
aList = Data.folderList(),
aList = FolderStore.folderList(),
fRenameCallback = function (oItem) {
return oItem ? (oItem.isSystemFolder() ? oItem.name() + ' ' + oItem.manageFolderSystemName() : oItem.name()) : '';
}
@ -51,11 +52,11 @@
aTop.push(['', this.sNoParentText]);
if ('' !== Data.namespace)
if ('' !== FolderStore.namespace)
{
fDisableCallback = function (oItem)
{
return Data.namespace !== oItem.fullNameRaw.substr(0, Data.namespace.length);
return FolderStore.namespace !== oItem.fullNameRaw.substr(0, FolderStore.namespace.length);
};
}
@ -70,22 +71,22 @@
sParentFolderName = this.selectedParentValue()
;
if ('' === sParentFolderName && 1 < Data.namespace.length)
if ('' === sParentFolderName && 1 < FolderStore.namespace.length)
{
sParentFolderName = Data.namespace.substr(0, Data.namespace.length - 1);
sParentFolderName = FolderStore.namespace.substr(0, FolderStore.namespace.length - 1);
}
Data.foldersCreating(true);
FolderStore.foldersCreating(true);
Remote.folderCreate(function (sResult, oData) {
Data.foldersCreating(false);
FolderStore.foldersCreating(false);
if (Enums.StorageResultType.Success === sResult && oData && oData.Result)
{
require('App/User').folders();
}
else
{
Data.folderList.error(
FolderStore.folderList.error(
oData && oData.ErrorCode ? Translator.getNotification(oData.ErrorCode) : Translator.i18n('NOTIFICATIONS/CANT_CREATE_FOLDER'));
}

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

@ -15,7 +15,6 @@
FolderStore = require('Stores/User/Folder'),
Settings = require('Storage/Settings'),
Data = require('Storage/User/Data'),
Remote = require('Storage/User/Remote'),
kn = require('Knoin/Knoin'),
@ -38,7 +37,7 @@
this.notification = ko.observable('');
this.folderSelectList = ko.computed(function () {
return Utils.folderListOptionsBuilder([], Data.folderList(), Data.folderListSystemNames(), [
return Utils.folderListOptionsBuilder([], FolderStore.folderList(), FolderStore.folderListSystemNames(), [
['', this.sChooseOnText],
[Consts.Values.UnuseOptionValue, this.sUnuseText]
], null, null, null, null, null, true);