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

Code refactoring

Browse source
This commit is contained in:
RainLoop Team 2015-02-03 03:58:58 +04:00
parent 79233ad83c
commit 286ab567af
53 changed files with 618 additions and 581 deletions
Download patch file Download diff file Expand all files Collapse all files

6
dev/View/Admin/Settings/Pane.js
View file

@ -29,9 +29,9 @@
this.adminManLoading = ko.computed(function () {
return '000' !== [
require('Stores/Admin/Domain').collection.loading() ? '1' : '0',
require('Stores/Admin/Plugin').collection.loading() ? '1' : '0',
require('Stores/Admin/Package').collection.loading() ? '1' : '0'
require('Stores/Admin/Domain').domains.loading() ? '1' : '0',
require('Stores/Admin/Plugin').plugins.loading() ? '1' : '0',
require('Stores/Admin/Package').packages.loading() ? '1' : '0'
].join('');
}, this);

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

@ -9,7 +9,7 @@
Utils = require('Common/Utils'),
Data = require('Storage/User/Data'),
PgpStore = require('Stores/User/Pgp'),
kn = require('Knoin/Knoin'),
AbstractView = require('Knoin/AbstractView')
@ -38,7 +38,7 @@
aMatch = null,
sKey = Utils.trim(this.key()),
oReg = /[\-]{3,6}BEGIN[\s]PGP[\s](PRIVATE|PUBLIC)[\s]KEY[\s]BLOCK[\-]{3,6}[\s\S]+?[\-]{3,6}END[\s]PGP[\s](PRIVATE|PUBLIC)[\s]KEY[\s]BLOCK[\-]{3,6}/gi,
oOpenpgpKeyring = Data.openpgpKeyring
oOpenpgpKeyring = PgpStore.openpgpKeyring
;
sKey = sKey.replace(/[\r\n]([a-zA-Z0-9]{2,}:[^\r\n]+)[\r\n]+([a-zA-Z0-9\/\\+=]{10,})/g, '\n$1!-!N!-!$2')

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

@ -24,6 +24,9 @@
AppStore = require('Stores/User/App'),
SettingsStore = require('Stores/User/Settings'),
IdentityStore = require('Stores/User/Identity'),
AccountStore = require('Stores/User/Account'),
FolderStore = require('Stores/User/Folder'),
PgpStore = require('Stores/User/Pgp'),
SocialStore = require('Stores/Social'),
Settings = require('Storage/Settings'),
@ -63,7 +66,7 @@
this.composeInEdit = Data.composeInEdit;
this.editorDefaultType = SettingsStore.editorDefaultType;
this.capaOpenPGP = Data.capaOpenPGP;
this.capaOpenPGP = PgpStore.capaOpenPGP;
this.resizer = ko.observable(false).extend({'throttle': 50});
@ -175,7 +178,7 @@
this.identitiesOptions = ko.computed(function () {
var aList = [{
'optValue': Data.accountEmail(),
'optValue': AccountStore.email(),
'optText': this.formattedFrom(false)
}];
@ -200,7 +203,7 @@
sID = this.currentIdentityID()
;
if (this.bCapaAdditionalIdentities && sID && sID !== Data.accountEmail())
if (this.bCapaAdditionalIdentities && sID && sID !== AccountStore.email())
{
oItem = _.find(aList, function (oItem) {
return oItem && sID === oItem['id'];
@ -269,7 +272,7 @@
var
sTo = Utils.trim(this.to()),
sSentFolder = Data.sentFolder(),
sSentFolder = FolderStore.sentFolder(),
aFlagsCache = []
;
@ -356,7 +359,7 @@
this.saveCommand = Utils.createCommand(this, function () {
if (Data.draftFolderNotEnabled())
if (FolderStore.draftFolderNotEnabled())
{
kn.showScreenPopup(require('View/Popup/FolderSystem'), [Enums.SetSystemFoldersNotification.Draft]);
}
@ -367,13 +370,13 @@
this.autosaveStart();
Cache.setFolderHash(Data.draftFolder(), '');
Cache.setFolderHash(FolderStore.draftFolder(), '');
Remote.saveMessage(
this.saveMessageResponse,
this.draftFolder(),
this.draftUid(),
Data.draftFolder(),
FolderStore.draftFolder(),
this.currentIdentityResultEmail(),
this.to(),
this.cc(),
@ -396,7 +399,7 @@
this.bSkipNextHide = true;
if (this.modalVisibility() && !this.saving() && !this.sending() &&
!Data.draftFolderNotEnabled())
!FolderStore.draftFolderNotEnabled())
{
this.saveCommand();
}
@ -422,7 +425,7 @@
Events.sub('interval.2m', function () {
if (this.modalVisibility() && !Data.draftFolderNotEnabled() && !this.isEmptyForm(false) &&
if (this.modalVisibility() && !FolderStore.draftFolderNotEnabled() && !this.isEmptyForm(false) &&
!this.saving() && !this.sending() && !this.savedError())
{
this.saveCommand();
@ -494,7 +497,7 @@
ComposePopupView.prototype.autosaveFunction = function ()
{
if (this.modalVisibility() && !Data.draftFolderNotEnabled() && !this.isEmptyForm(false) &&
if (this.modalVisibility() && !FolderStore.draftFolderNotEnabled() && !this.isEmptyForm(false) &&
!this.saving() && !this.sending() && !this.savedError())
{
this.saveCommand();
@ -525,7 +528,7 @@
ComposePopupView.prototype.openOpenPgpPopup = function ()
{
if (this.capaOpenPGP() && this.oEditor && !this.oEditor.isHtml())
if (PgpStore.capaOpenPGP() && this.oEditor && !this.oEditor.isHtml())
{
var self = this;
kn.showScreenPopup(require('View/Popup/ComposeOpenPgp'), [
@ -546,7 +549,7 @@
ComposePopupView.prototype.reloadDraftFolder = function ()
{
var
sDraftFolder = Data.draftFolder()
sDraftFolder = FolderStore.draftFolder()
;
if ('' !== sDraftFolder)
@ -589,7 +592,7 @@
});
}
oIDs[Data.accountEmail()] = Data.accountEmail();
oIDs[AccountStore.email()] = AccountStore.email();
if (oMessage)
{
@ -616,7 +619,7 @@
if ('' === sResult)
{
sResult = Data.accountEmail();
sResult = AccountStore.email();
sEmail = sResult;
}
@ -639,8 +642,8 @@
ComposePopupView.prototype.formattedFrom = function (bHeaderResult)
{
var
sDisplayName = Data.displayName(),
sEmail = Data.accountEmail()
sDisplayName = AccountStore.displayName(),
sEmail = AccountStore.email()
;
return '' === sDisplayName ? sEmail :
@ -946,9 +949,9 @@
aResplyAllParts = [],
oExcludeEmail = {},
oIdResult = null,
mEmail = Data.accountEmail(),
sSignature = Data.signature(),
bSignatureToAll = Data.signatureToAll(),
mEmail = AccountStore.email(),
sSignature = AccountStore.signature(),
bSignatureToAll = AccountStore.signatureToAll(),
aDownloads = [],
aDraftInfo = null,
oMessage = null,

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

@ -114,19 +114,19 @@
if (oPrivateKey && 0 === aPublicKeys.length)
{
self.resultCallback(
Data.openpgp.signClearMessage([oPrivateKey], self.text())
PgpStore.openpgp.signClearMessage([oPrivateKey], self.text())
);
}
else if (oPrivateKey && 0 < aPublicKeys.length)
{
self.resultCallback(
Data.openpgp.signAndEncryptMessage(aPublicKeys, oPrivateKey, self.text())
PgpStore.openpgp.signAndEncryptMessage(aPublicKeys, oPrivateKey, self.text())
);
}
else if (!oPrivateKey && 0 < aPublicKeys.length)
{
self.resultCallback(
Data.openpgp.encryptMessage(aPublicKeys, self.text())
PgpStore.openpgp.encryptMessage(aPublicKeys, self.text())
);
}
}

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

@ -18,7 +18,7 @@
Links = require('Common/Links'),
Translator = require('Common/Translator'),
SettingsUserStore = require('Stores/User/Settings'),
SettingsStore = require('Stores/User/Settings'),
Data = require('Storage/User/Data'),
Remote = require('Storage/User/Remote'),
@ -175,7 +175,7 @@
this.viewSaving = ko.observable(false);
this.useCheckboxesInList = SettingsUserStore.useCheckboxesInList;
this.useCheckboxesInList = SettingsStore.useCheckboxesInList;
this.search.subscribe(function () {
this.reloadContactList();

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

@ -12,6 +12,8 @@
Utils = require('Common/Utils'),
Translator = require('Common/Translator'),
FolderStore = require('Stores/User/Folder'),
Settings = require('Storage/Settings'),
Data = require('Storage/User/Data'),
Remote = require('Storage/User/Remote'),
@ -43,31 +45,30 @@
}, this);
var
self = this,
fSaveSystemFolders = null,
fCallback = null
;
this.sentFolder = Data.sentFolder;
this.draftFolder = Data.draftFolder;
this.spamFolder = Data.spamFolder;
this.trashFolder = Data.trashFolder;
this.archiveFolder = Data.archiveFolder;
this.sentFolder = FolderStore.sentFolder;
this.draftFolder = FolderStore.draftFolder;
this.spamFolder = FolderStore.spamFolder;
this.trashFolder = FolderStore.trashFolder;
this.archiveFolder = FolderStore.archiveFolder;
fSaveSystemFolders = _.debounce(function () {
Settings.settingsSet('SentFolder', self.sentFolder());
Settings.settingsSet('DraftFolder', self.draftFolder());
Settings.settingsSet('SpamFolder', self.spamFolder());
Settings.settingsSet('TrashFolder', self.trashFolder());
Settings.settingsSet('ArchiveFolder', self.archiveFolder());
Settings.settingsSet('SentFolder', FolderStore.sentFolder());
Settings.settingsSet('DraftFolder', FolderStore.draftFolder());
Settings.settingsSet('SpamFolder', FolderStore.spamFolder());
Settings.settingsSet('TrashFolder', FolderStore.trashFolder());
Settings.settingsSet('ArchiveFolder', FolderStore.archiveFolder());
Remote.saveSystemFolders(Utils.emptyFunction, {
'SentFolder': self.sentFolder(),
'DraftFolder': self.draftFolder(),
'SpamFolder': self.spamFolder(),
'TrashFolder': self.trashFolder(),
'ArchiveFolder': self.archiveFolder(),
'SentFolder': FolderStore.sentFolder(),
'DraftFolder': FolderStore.draftFolder(),
'SpamFolder': FolderStore.spamFolder(),
'TrashFolder': FolderStore.trashFolder(),
'ArchiveFolder': FolderStore.archiveFolder(),
'NullFolder': 'NullFolder'
});
@ -75,20 +76,20 @@
fCallback = function () {
Settings.settingsSet('SentFolder', self.sentFolder());
Settings.settingsSet('DraftFolder', self.draftFolder());
Settings.settingsSet('SpamFolder', self.spamFolder());
Settings.settingsSet('TrashFolder', self.trashFolder());
Settings.settingsSet('ArchiveFolder', self.archiveFolder());
Settings.settingsSet('SentFolder', FolderStore.sentFolder());
Settings.settingsSet('DraftFolder', FolderStore.draftFolder());
Settings.settingsSet('SpamFolder', FolderStore.spamFolder());
Settings.settingsSet('TrashFolder', FolderStore.trashFolder());
Settings.settingsSet('ArchiveFolder', FolderStore.archiveFolder());
fSaveSystemFolders();
};
this.sentFolder.subscribe(fCallback);
this.draftFolder.subscribe(fCallback);
this.spamFolder.subscribe(fCallback);
this.trashFolder.subscribe(fCallback);
this.archiveFolder.subscribe(fCallback);
FolderStore.sentFolder.subscribe(fCallback);
FolderStore.draftFolder.subscribe(fCallback);
FolderStore.spamFolder.subscribe(fCallback);
FolderStore.trashFolder.subscribe(fCallback);
FolderStore.archiveFolder.subscribe(fCallback);
this.defautOptionsAfterRender = Utils.defautOptionsAfterRender;

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

@ -12,7 +12,7 @@
Translator = require('Common/Translator'),
Remote = require('Storage/User/Remote'),
Data = require('Storage/User/Data'),
AccountStore = require('Stores/User/Account'),
kn = require('Knoin/Knoin'),
AbstractView = require('Knoin/AbstractView')
@ -147,7 +147,7 @@
this.replyTo(oIdentity.replyTo());
this.bcc(oIdentity.bcc());
this.owner(this.id === Data.accountEmail());
this.owner(this.id === AccountStore.email());
}
};

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

@ -10,6 +10,7 @@
Utils = require('Common/Utils'),
Data = require('Storage/User/Data'),
PgpStore = require('Stores/User/Pgp'),
kn = require('Knoin/Knoin'),
AbstractView = require('Knoin/AbstractView')
@ -43,7 +44,7 @@
self = this,
sUserID = '',
mKeyPair = null,
oOpenpgpKeyring = Data.openpgpKeyring
oOpenpgpKeyring = PgpStore.openpgpKeyring
;
this.email.error('' === Utils.trim(this.email()));
@ -61,8 +62,7 @@
this.submitRequest(true);
_.delay(function () {
// mKeyPair = Data.openpgp.generateKeyPair(1, Utils.pInt(self.keyBitLength()), sUserID, Utils.trim(self.password()));
mKeyPair = Data.openpgp.generateKeyPair({
mKeyPair = PgpStore.openpgp.generateKeyPair({
'userId': sUserID,
'numBits': Utils.pInt(self.keyBitLength()),
'passphrase': Utils.trim(self.password())

4
dev/View/User/AbstractSystemDropDown.js
View file

@ -29,7 +29,7 @@
{
AbstractView.call(this, 'Right', 'SystemDropDown');
this.accountEmail = Data.accountEmail;
this.accountEmail = AccountStore.email;
this.accounts = AccountStore.accounts;
this.accountsUnreadCount = AccountStore.accountsUnreadCount;
@ -58,7 +58,7 @@
AbstractSystemDropDownUserView.prototype.emailTitle = function ()
{
return Data.accountEmail();
return AccountStore.email();
};
AbstractSystemDropDownUserView.prototype.settingsClick = function ()

4
dev/View/User/Login.js
View file

@ -357,8 +357,8 @@
break;
}
this.email(Data.devEmail);
this.password(Data.devPassword);
this.email(AppStore.devEmail);
this.password(AppStore.devPassword);
if (this.googleLoginEnabled())
{

4
dev/View/User/MailBox/FolderList.js
View file

@ -16,7 +16,7 @@
Links = require('Common/Links'),
AppStore = require('Stores/User/App'),
SettingsUserStore = require('Stores/User/Settings'),
SettingsStore = require('Stores/User/Settings'),
Cache = require('Storage/User/Cache'),
Data = require('Storage/User/Data'),
@ -90,7 +90,7 @@
if (oFolder)
{
if (Enums.Layout.NoPreview === SettingsUserStore.layout())
if (Enums.Layout.NoPreview === SettingsStore.layout())
{
Data.message(null);
}

25
dev/View/User/MailBox/MessageList.js
View file

@ -22,6 +22,7 @@
QuotaStore = require('Stores/User/Quota'),
SettingsStore = require('Stores/User/Settings'),
FolderStore = require('Stores/User/Folder'),
Settings = require('Storage/Settings'),
Cache = require('Storage/User/Cache'),
@ -137,36 +138,36 @@
}, this);
this.isSpamFolder = ko.computed(function () {
return Data.spamFolder() === this.messageListEndFolder() &&
'' !== Data.spamFolder();
return FolderStore.spamFolder() === this.messageListEndFolder() &&
'' !== FolderStore.spamFolder();
}, this);
this.isSpamDisabled = ko.computed(function () {
return Consts.Values.UnuseOptionValue === Data.spamFolder();
return Consts.Values.UnuseOptionValue === FolderStore.spamFolder();
}, this);
this.isTrashFolder = ko.computed(function () {
return Data.trashFolder() === this.messageListEndFolder() &&
'' !== Data.trashFolder();
return FolderStore.trashFolder() === this.messageListEndFolder() &&
'' !== FolderStore.trashFolder();
}, this);
this.isDraftFolder = ko.computed(function () {
return Data.draftFolder() === this.messageListEndFolder() &&
'' !== Data.draftFolder();
return FolderStore.draftFolder() === this.messageListEndFolder() &&
'' !== FolderStore.draftFolder();
}, this);
this.isSentFolder = ko.computed(function () {
return Data.sentFolder() === this.messageListEndFolder() &&
'' !== Data.sentFolder();
return FolderStore.sentFolder() === this.messageListEndFolder() &&
'' !== FolderStore.sentFolder();
}, this);
this.isArchiveFolder = ko.computed(function () {
return Data.archiveFolder() === this.messageListEndFolder() &&
'' !== Data.archiveFolder();
return FolderStore.archiveFolder() === this.messageListEndFolder() &&
'' !== FolderStore.archiveFolder();
}, this);
this.isArchiveDisabled = ko.computed(function () {
return Consts.Values.UnuseOptionValue === Data.archiveFolder();
return Consts.Values.UnuseOptionValue === FolderStore.archiveFolder();
}, this);
this.canBeMoved = this.hasCheckedOrSelectedLines;

26
dev/View/User/MailBox/MessageView.js
View file

@ -19,7 +19,9 @@
Events = require('Common/Events'),
Translator = require('Common/Translator'),
SettingsUserStore = require('Stores/User/Settings'),
SettingsStore = require('Stores/User/Settings'),
AccountStore = require('Stores/User/Account'),
FolderStore = require('Stores/User/Folder'),
Local = require('Storage/Client'),
Cache = require('Storage/User/Cache'),
@ -62,10 +64,10 @@
this.messageLoading = Data.messageLoading;
this.messageLoadingThrottle = Data.messageLoadingThrottle;
this.messagesBodiesDom = Data.messagesBodiesDom;
this.useThreads = SettingsUserStore.useThreads;
this.replySameFolder = SettingsUserStore.replySameFolder;
this.layout = SettingsUserStore.layout;
this.usePreviewPane = SettingsUserStore.usePreviewPane;
this.useThreads = SettingsStore.useThreads;
this.replySameFolder = SettingsStore.replySameFolder;
this.layout = SettingsStore.layout;
this.usePreviewPane = SettingsStore.usePreviewPane;
this.isMessageSelected = Data.isMessageSelected;
this.messageActiveDom = Data.messageActiveDom;
this.messageError = Data.messageError;
@ -727,7 +729,7 @@
*/
MessageViewMailBoxUserView.prototype.isDraftFolder = function ()
{
return Data.message() && Data.draftFolder() === Data.message().folderFullNameRaw;
return Data.message() && FolderStore.draftFolder() === Data.message().folderFullNameRaw;
};
/**
@ -735,7 +737,7 @@
*/
MessageViewMailBoxUserView.prototype.isSentFolder = function ()
{
return Data.message() && Data.sentFolder() === Data.message().folderFullNameRaw;
return Data.message() && FolderStore.sentFolder() === Data.message().folderFullNameRaw;
};
/**
@ -743,7 +745,7 @@
*/
MessageViewMailBoxUserView.prototype.isSpamFolder = function ()
{
return Data.message() && Data.spamFolder() === Data.message().folderFullNameRaw;
return Data.message() && FolderStore.spamFolder() === Data.message().folderFullNameRaw;
};
/**
@ -751,7 +753,7 @@
*/
MessageViewMailBoxUserView.prototype.isSpamDisabled = function ()
{
return Data.message() && Data.spamFolder() === Consts.Values.UnuseOptionValue;
return Data.message() && FolderStore.spamFolder() === Consts.Values.UnuseOptionValue;
};
/**
@ -759,7 +761,7 @@
*/
MessageViewMailBoxUserView.prototype.isArchiveFolder = function ()
{
return Data.message() && Data.archiveFolder() === Data.message().folderFullNameRaw;
return Data.message() && FolderStore.archiveFolder() === Data.message().folderFullNameRaw;
};
/**
@ -767,7 +769,7 @@
*/
MessageViewMailBoxUserView.prototype.isArchiveDisabled = function ()
{
return Data.message() && Data.archiveFolder() === Consts.Values.UnuseOptionValue;
return Data.message() && FolderStore.archiveFolder() === Consts.Values.UnuseOptionValue;
};
/**
@ -873,7 +875,7 @@
Remote.sendReadReceiptMessage(Utils.emptyFunction, oMessage.folderFullNameRaw, oMessage.uid,
oMessage.readReceipt(),
Translator.i18n('READ_RECEIPT/SUBJECT', {'SUBJECT': oMessage.subject()}),
Translator.i18n('READ_RECEIPT/BODY', {'READ-RECEIPT': Data.accountEmail()}));
Translator.i18n('READ_RECEIPT/BODY', {'READ-RECEIPT': AccountStore.email()}));
oMessage.isReadReceipt(true);