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

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);