Code refactoring

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

View file

@ -17,9 +17,10 @@
AppStore = require('Stores/User/App'),
SettingsStore = require('Stores/User/Settings'),
FolderStore = require('Stores/User/Folder'),
MessageStore = require('Stores/User/Message'),
Cache = require('Storage/User/Cache'),
Data = require('Storage/User/Data'),
kn = require('Knoin/Knoin'),
AbstractView = require('Knoin/AbstractView')
@ -36,14 +37,14 @@
this.oContentVisible = null;
this.oContentScrollable = null;
this.composeInEdit = Data.composeInEdit;
this.composeInEdit = AppStore.composeInEdit;
this.messageList = Data.messageList;
this.folderList = Data.folderList;
this.folderListSystem = Data.folderListSystem;
this.foldersChanging = Data.foldersChanging;
this.messageList = MessageStore.messageList;
this.folderList = FolderStore.folderList;
this.folderListSystem = FolderStore.folderListSystem;
this.foldersChanging = FolderStore.foldersChanging;
this.foldersListWithSingleInboxRootFolder = Data.foldersListWithSingleInboxRootFolder;
this.foldersListWithSingleInboxRootFolder = FolderStore.foldersListWithSingleInboxRootFolder;
this.leftPanelDisabled = Globals.leftPanelDisabled;
@ -94,10 +95,10 @@
{
if (Enums.Layout.NoPreview === SettingsStore.layout())
{
Data.message(null);
MessageStore.message(null);
}
if (oFolder.fullNameRaw === Data.currentFolderFullNameRaw())
if (oFolder.fullNameRaw === FolderStore.currentFolderFullNameRaw())
{
Cache.setFolderHash(oFolder.fullNameRaw, '');
}
@ -143,7 +144,7 @@
var $items = $('.b-folders .e-item .e-link:not(.hidden).focused', oDom);
if ($items.length && $items[0])
{
self.folderList.focused(false);
FolderStore.folderList.focused(false);
$items.click();
}
@ -167,11 +168,11 @@
});
key('esc, tab, shift+tab, right', Enums.KeyState.FolderList, function () {
self.folderList.focused(false);
FolderStore.folderList.focused(false);
return false;
});
self.folderList.focused.subscribe(function (bValue) {
FolderStore.folderList.focused.subscribe(function (bValue) {
$('.b-folders .e-item .e-link.focused', oDom).removeClass('focused');
if (bValue)
{

View file

@ -23,10 +23,10 @@
QuotaStore = require('Stores/User/Quota'),
SettingsStore = require('Stores/User/Settings'),
FolderStore = require('Stores/User/Folder'),
MessageStore = require('Stores/User/Message'),
Settings = require('Storage/Settings'),
Cache = require('Storage/User/Cache'),
Data = require('Storage/User/Data'),
Remote = require('Storage/User/Remote'),
kn = require('Knoin/Knoin'),
@ -49,24 +49,24 @@
this.popupVisibility = Globals.popupVisibility;
this.message = Data.message;
this.messageList = Data.messageList;
this.folderList = Data.folderList;
this.currentMessage = Data.currentMessage;
this.isMessageSelected = Data.isMessageSelected;
this.messageListSearch = Data.messageListSearch;
this.messageListError = Data.messageListError;
this.folderMenuForMove = Data.folderMenuForMove;
this.message = MessageStore.message;
this.messageList = MessageStore.messageList;
this.folderList = FolderStore.folderList;
this.currentMessage = MessageStore.currentMessage;
this.isMessageSelected = MessageStore.isMessageSelected;
this.messageListSearch = MessageStore.messageListSearch;
this.messageListError = MessageStore.messageListError;
this.folderMenuForMove = FolderStore.folderMenuForMove;
this.useCheckboxesInList = SettingsStore.useCheckboxesInList;
this.mainMessageListSearch = Data.mainMessageListSearch;
this.messageListEndFolder = Data.messageListEndFolder;
this.mainMessageListSearch = MessageStore.mainMessageListSearch;
this.messageListEndFolder = MessageStore.messageListEndFolder;
this.messageListChecked = Data.messageListChecked;
this.messageListCheckedOrSelected = Data.messageListCheckedOrSelected;
this.messageListCheckedOrSelectedUidsWithSubMails = Data.messageListCheckedOrSelectedUidsWithSubMails;
this.messageListCompleteLoadingThrottle = Data.messageListCompleteLoadingThrottle;
this.messageListChecked = MessageStore.messageListChecked;
this.messageListCheckedOrSelected = MessageStore.messageListCheckedOrSelected;
this.messageListCheckedOrSelectedUidsWithSubMails = MessageStore.messageListCheckedOrSelectedUidsWithSubMails;
this.messageListCompleteLoadingThrottle = MessageStore.messageListCompleteLoadingThrottle;
Translator.initOnStartOrLangChange(function () {
this.emptySubjectValue = Translator.i18n('MESSAGE_LIST/EMPTY_SUBJECT_TEXT');
@ -91,20 +91,21 @@
});
this.messageListSearchDesc = ko.computed(function () {
var sValue = Data.messageListEndSearch();
var sValue = MessageStore.messageListEndSearch();
return '' === sValue ? '' : Translator.i18n('MESSAGE_LIST/SEARCH_RESULT_FOR', {'SEARCH': sValue});
});
this.messageListPagenator = ko.computed(Utils.computedPagenatorHelper(Data.messageListPage, Data.messageListPageCount));
this.messageListPagenator = ko.computed(Utils.computedPagenatorHelper(
MessageStore.messageListPage, MessageStore.messageListPageCount));
this.checkAll = ko.computed({
'read': function () {
return 0 < Data.messageListChecked().length;
return 0 < MessageStore.messageListChecked().length;
},
'write': function (bValue) {
bValue = !!bValue;
_.each(Data.messageList(), function (oMessage) {
_.each(MessageStore.messageList(), function (oMessage) {
oMessage.checked(bValue);
});
}
@ -123,8 +124,8 @@
this.isIncompleteChecked = ko.computed(function () {
var
iM = Data.messageList().length,
iC = Data.messageListChecked().length
iM = MessageStore.messageList().length,
iC = MessageStore.messageListChecked().length
;
return 0 < iM && 0 < iC && iM > iC;
}, this);
@ -173,48 +174,48 @@
this.canBeMoved = this.hasCheckedOrSelectedLines;
this.clearCommand = Utils.createCommand(this, function () {
kn.showScreenPopup(require('View/Popup/FolderClear'), [Data.currentFolder()]);
kn.showScreenPopup(require('View/Popup/FolderClear'), [FolderStore.currentFolder()]);
});
this.multyForwardCommand = Utils.createCommand(this, function () {
kn.showScreenPopup(require('View/Popup/Compose'), [
Enums.ComposeType.ForwardAsAttachment, Data.messageListCheckedOrSelected()]);
Enums.ComposeType.ForwardAsAttachment, MessageStore.messageListCheckedOrSelected()]);
}, this.canBeMoved);
this.deleteWithoutMoveCommand = Utils.createCommand(this, function () {
require('App/User').deleteMessagesFromFolder(Enums.FolderType.Trash,
Data.currentFolderFullNameRaw(),
Data.messageListCheckedOrSelectedUidsWithSubMails(), false);
FolderStore.currentFolderFullNameRaw(),
MessageStore.messageListCheckedOrSelectedUidsWithSubMails(), false);
}, this.canBeMoved);
this.deleteCommand = Utils.createCommand(this, function () {
require('App/User').deleteMessagesFromFolder(Enums.FolderType.Trash,
Data.currentFolderFullNameRaw(),
Data.messageListCheckedOrSelectedUidsWithSubMails(), true);
FolderStore.currentFolderFullNameRaw(),
MessageStore.messageListCheckedOrSelectedUidsWithSubMails(), true);
}, this.canBeMoved);
this.archiveCommand = Utils.createCommand(this, function () {
require('App/User').deleteMessagesFromFolder(Enums.FolderType.Archive,
Data.currentFolderFullNameRaw(),
Data.messageListCheckedOrSelectedUidsWithSubMails(), true);
FolderStore.currentFolderFullNameRaw(),
MessageStore.messageListCheckedOrSelectedUidsWithSubMails(), true);
}, this.canBeMoved);
this.spamCommand = Utils.createCommand(this, function () {
require('App/User').deleteMessagesFromFolder(Enums.FolderType.Spam,
Data.currentFolderFullNameRaw(),
Data.messageListCheckedOrSelectedUidsWithSubMails(), true);
FolderStore.currentFolderFullNameRaw(),
MessageStore.messageListCheckedOrSelectedUidsWithSubMails(), true);
}, this.canBeMoved);
this.notSpamCommand = Utils.createCommand(this, function () {
require('App/User').deleteMessagesFromFolder(Enums.FolderType.NotSpam,
Data.currentFolderFullNameRaw(),
Data.messageListCheckedOrSelectedUidsWithSubMails(), true);
FolderStore.currentFolderFullNameRaw(),
MessageStore.messageListCheckedOrSelectedUidsWithSubMails(), true);
}, this.canBeMoved);
this.moveCommand = Utils.createCommand(this, Utils.emptyFunction, this.canBeMoved);
this.reloadCommand = Utils.createCommand(this, function () {
if (!Data.messageListCompleteLoadingThrottle())
if (!MessageStore.messageListCompleteLoadingThrottle())
{
require('App/User').reloadMessageList(false, true);
}
@ -229,18 +230,19 @@
this.selector.on('onItemSelect', _.bind(function (oMessage) {
if (oMessage)
{
Data.message(Data.staticMessageList.populateByMessageListItem(oMessage));
this.populateMessageBody(Data.message());
MessageStore.message(MessageStore.staticMessage.populateByMessageListItem(oMessage));
this.populateMessageBody(MessageStore.message());
if (Enums.Layout.NoPreview === SettingsStore.layout())
{
kn.setHash(Links.messagePreview(), true);
Data.message.focused(true);
MessageStore.message.focused(true);
}
}
else
{
Data.message(null);
MessageStore.message(null);
}
}, this));
@ -248,23 +250,14 @@
return oMessage ? oMessage.generateUid() : '';
});
Data.messageListEndHash.subscribe(function () {
MessageStore.messageListEndHash.subscribe(function () {
this.selector.scrollToTop();
}, this);
Data.messageListEndFolder.subscribe(function (sFolder) {
var oMessage = Data.message();
if (oMessage && sFolder && sFolder !== oMessage.folderFullNameRaw)
{
Data.message(null);
}
}, this);
SettingsStore.layout.subscribe(function (mValue) {
this.selector.autoSelect(Enums.Layout.NoPreview !== mValue);
}, this);
SettingsStore.layout.valueHasMutated();
Events
@ -318,8 +311,8 @@
if (this.canBeMoved())
{
require('App/User').moveMessagesToFolder(
Data.currentFolderFullNameRaw(),
Data.messageListCheckedOrSelectedUidsWithSubMails(), sToFolderFullNameRaw, bCopy);
FolderStore.currentFolderFullNameRaw(),
MessageStore.messageListCheckedOrSelectedUidsWithSubMails(), sToFolderFullNameRaw, bCopy);
}
return false;
@ -334,15 +327,15 @@
var
oEl = Utils.draggablePlace(),
aUids = Data.messageListCheckedOrSelectedUidsWithSubMails()
aUids = MessageStore.messageListCheckedOrSelectedUidsWithSubMails()
;
oEl.data('rl-folder', Data.currentFolderFullNameRaw());
oEl.data('rl-folder', FolderStore.currentFolderFullNameRaw());
oEl.data('rl-uids', aUids);
oEl.find('.text').text('' + aUids.length);
_.defer(function () {
var aUids = Data.messageListCheckedOrSelectedUidsWithSubMails();
var aUids = MessageStore.messageListCheckedOrSelectedUidsWithSubMails();
oEl.data('rl-uids', aUids);
oEl.find('.text').text('' + aUids.length);
@ -358,22 +351,22 @@
*/
MessageListMailBoxUserView.prototype.onMessageResponse = function (sResult, oData, bCached)
{
Data.hideMessageBodies();
Data.messageLoading(false);
MessageStore.hideMessageBodies();
MessageStore.messageLoading(false);
if (Enums.StorageResultType.Success === sResult && oData && oData.Result)
{
Data.setMessage(oData, bCached);
MessageStore.setMessage(oData, bCached);
}
else if (Enums.StorageResultType.Unload === sResult)
{
Data.message(null);
Data.messageError('');
MessageStore.message(null);
MessageStore.messageError('');
}
else if (Enums.StorageResultType.Abort !== sResult)
{
Data.message(null);
Data.messageError((oData && oData.ErrorCode ?
MessageStore.message(null);
MessageStore.messageError((oData && oData.ErrorCode ?
Translator.getNotification(oData.ErrorCode) :
Translator.getNotification(Enums.Notification.UnknownError)));
}
@ -385,7 +378,7 @@
{
if (Remote.message(this.onMessageResponse, oMessage.folderFullNameRaw, oMessage.uid))
{
Data.messageLoading(true);
MessageStore.messageLoading(true);
}
else
{
@ -409,7 +402,7 @@
if (Utils.isUnd(aMessages))
{
aMessages = Data.messageListChecked();
aMessages = MessageStore.messageListChecked();
}
aUids = _.map(aMessages, function (oMessage) {
@ -484,7 +477,7 @@
{
var
oFolder = null,
aMessages = Data.messageList()
aMessages = MessageStore.messageList()
;
if ('' !== sFolderFullNameRaw)
@ -530,27 +523,31 @@
MessageListMailBoxUserView.prototype.listSetSeen = function ()
{
this.setAction(Data.currentFolderFullNameRaw(), Enums.MessageSetAction.SetSeen, Data.messageListCheckedOrSelected());
this.setAction(FolderStore.currentFolderFullNameRaw(), Enums.MessageSetAction.SetSeen,
MessageStore.messageListCheckedOrSelected());
};
MessageListMailBoxUserView.prototype.listSetAllSeen = function ()
{
this.setActionForAll(Data.currentFolderFullNameRaw(), Enums.MessageSetAction.SetSeen);
this.setActionForAll(FolderStore.currentFolderFullNameRaw(), Enums.MessageSetAction.SetSeen);
};
MessageListMailBoxUserView.prototype.listUnsetSeen = function ()
{
this.setAction(Data.currentFolderFullNameRaw(), Enums.MessageSetAction.UnsetSeen, Data.messageListCheckedOrSelected());
this.setAction(FolderStore.currentFolderFullNameRaw(), Enums.MessageSetAction.UnsetSeen,
MessageStore.messageListCheckedOrSelected());
};
MessageListMailBoxUserView.prototype.listSetFlags = function ()
{
this.setAction(Data.currentFolderFullNameRaw(), Enums.MessageSetAction.SetFlag, Data.messageListCheckedOrSelected());
this.setAction(FolderStore.currentFolderFullNameRaw(), Enums.MessageSetAction.SetFlag,
MessageStore.messageListCheckedOrSelected());
};
MessageListMailBoxUserView.prototype.listUnsetFlags = function ()
{
this.setAction(Data.currentFolderFullNameRaw(), Enums.MessageSetAction.UnsetFlag, Data.messageListCheckedOrSelected());
this.setAction(FolderStore.currentFolderFullNameRaw(), Enums.MessageSetAction.UnsetFlag,
MessageStore.messageListCheckedOrSelected());
};
MessageListMailBoxUserView.prototype.flagMessages = function (oCurrentMessage)
@ -649,9 +646,9 @@
if (oMessage && !oMessage.lastInCollapsedThreadLoading())
{
Data.messageListThreadFolder(oMessage.folderFullNameRaw);
MessageStore.messageListThreadFolder(oMessage.folderFullNameRaw);
aList = Data.messageListThreadUids();
aList = MessageStore.messageListThreadUids();
if (oMessage.lastInCollapsedThread())
{
@ -662,7 +659,7 @@
aList = _.without(aList, 0 < oMessage.parentUid() ? oMessage.parentUid() : oMessage.uid);
}
Data.messageListThreadUids(_.uniq(aList));
MessageStore.messageListThreadUids(_.uniq(aList));
oMessage.lastInCollapsedThreadLoading(true);
oMessage.lastInCollapsedThread(!oMessage.lastInCollapsedThread());
@ -687,9 +684,9 @@
if (oPage)
{
kn.setHash(Links.mailBox(
Data.currentFolderFullNameHash(),
FolderStore.currentFolderFullNameHash(),
oPage.value,
Data.messageListSearch()
MessageStore.messageListSearch()
));
}
})
@ -733,7 +730,7 @@
key('delete, shift+delete, shift+3', Enums.KeyState.MessageList, function (event, handler) {
if (event)
{
if (0 < Data.messageListCheckedOrSelected().length)
if (0 < MessageStore.messageListCheckedOrSelected().length)
{
if (handler && 'shift+delete' === handler.shortcut)
{
@ -815,7 +812,7 @@
key('tab, shift+tab, left, right', Enums.KeyState.MessageList, function (event, handler) {
if (event && handler && ('shift+tab' === handler.shortcut || 'left' === handler.shortcut))
{
self.folderList.focused(true);
FolderStore.folderList.focused(true);
}
else if (self.message())
{
@ -904,7 +901,7 @@
'disableFolderDragAndDrop': true,
'hidden': {
'Folder': function () {
return Data.currentFolderFullNameRaw();
return FolderStore.currentFolderFullNameRaw();
}
},
'dragAndDropElement': this.dragOverArea(),
@ -933,13 +930,15 @@
this.dragOver(false);
}, this))
.on('onSelect', _.bind(function (sUid, oData) {
if (sUid && oData && 'message/rfc822' === oData['Type'])
{
Data.messageListLoading(true);
MessageStore.messageListLoading(true);
return true;
}
return false;
}, this))
.on('onComplete', _.bind(function () {
require('App/User').reloadMessageList(true, true);

View file

@ -22,10 +22,10 @@
SettingsStore = require('Stores/User/Settings'),
AccountStore = require('Stores/User/Account'),
FolderStore = require('Stores/User/Folder'),
MessageStore = require('Stores/User/Message'),
Local = require('Storage/Client'),
Cache = require('Storage/User/Cache'),
Data = require('Storage/User/Data'),
Remote = require('Storage/User/Remote'),
kn = require('Knoin/Knoin'),
@ -56,23 +56,23 @@
this.pswp = null;
this.message = Data.message;
this.currentMessage = Data.currentMessage;
this.messageListChecked = Data.messageListChecked;
this.hasCheckedMessages = Data.hasCheckedMessages;
this.messageListCheckedOrSelectedUidsWithSubMails = Data.messageListCheckedOrSelectedUidsWithSubMails;
this.messageLoading = Data.messageLoading;
this.messageLoadingThrottle = Data.messageLoadingThrottle;
this.messagesBodiesDom = Data.messagesBodiesDom;
this.message = MessageStore.message;
this.currentMessage = MessageStore.currentMessage;
this.messageListChecked = MessageStore.messageListChecked;
this.hasCheckedMessages = MessageStore.hasCheckedMessages;
this.messageListCheckedOrSelectedUidsWithSubMails = MessageStore.messageListCheckedOrSelectedUidsWithSubMails;
this.messageLoading = MessageStore.messageLoading;
this.messageLoadingThrottle = MessageStore.messageLoadingThrottle;
this.messagesBodiesDom = MessageStore.messagesBodiesDom;
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;
this.isMessageSelected = MessageStore.isMessageSelected;
this.messageActiveDom = MessageStore.messageActiveDom;
this.messageError = MessageStore.messageError;
this.fullScreenMode = Data.messageFullScreenMode;
this.fullScreenMode = MessageStore.messageFullScreenMode;
this.lastReplyAction_ = ko.observable('');
this.lastReplyAction = ko.computed({
@ -113,7 +113,7 @@
// commands
this.closeMessage = Utils.createCommand(this, function () {
Data.message(null);
MessageStore.message(null);
});
this.replyCommand = createCommandHelper(Enums.ComposeType.Reply);
@ -141,7 +141,7 @@
if (this.message())
{
require('App/User').deleteMessagesFromFolder(Enums.FolderType.Trash,
Data.currentFolderFullNameRaw(),
FolderStore.currentFolderFullNameRaw(),
[this.message().uid], false);
}
}, this.messageVisibility);
@ -395,7 +395,7 @@
*/
MessageViewMailBoxUserView.prototype.replyOrforward = function (sType)
{
kn.showScreenPopup(require('View/Popup/Compose'), [sType, Data.message()]);
kn.showScreenPopup(require('View/Popup/Compose'), [sType, MessageStore.message()]);
};
MessageViewMailBoxUserView.prototype.onBuild = function (oDom)
@ -619,7 +619,7 @@
// reply
key('r', [Enums.KeyState.MessageList, Enums.KeyState.MessageView], function () {
if (Data.message())
if (MessageStore.message())
{
self.replyCommand();
return false;
@ -628,7 +628,7 @@
// replaAll
key('a', [Enums.KeyState.MessageList, Enums.KeyState.MessageView], function () {
if (Data.message())
if (MessageStore.message())
{
self.replyAllCommand();
return false;
@ -637,7 +637,7 @@
// forward
key('f', [Enums.KeyState.MessageList, Enums.KeyState.MessageView], function () {
if (Data.message())
if (MessageStore.message())
{
self.forwardCommand();
return false;
@ -646,7 +646,7 @@
// message information
// key('i', [Enums.KeyState.MessageList, Enums.KeyState.MessageView], function () {
// if (oData.message())
// if (MessageStore.message())
// {
// self.showFullInfo(!self.showFullInfo());
// return false;
@ -655,9 +655,9 @@
// toggle message blockquotes
key('b', [Enums.KeyState.MessageList, Enums.KeyState.MessageView], function () {
if (Data.message() && Data.message().body)
if (MessageStore.message() && MessageStore.message().body)
{
Data.message().body.find('.rlBlockquoteSwitcher').click();
MessageStore.message().body.find('.rlBlockquoteSwitcher').click();
return false;
}
});
@ -731,7 +731,7 @@
*/
MessageViewMailBoxUserView.prototype.isDraftFolder = function ()
{
return Data.message() && FolderStore.draftFolder() === Data.message().folderFullNameRaw;
return MessageStore.message() && FolderStore.draftFolder() === MessageStore.message().folderFullNameRaw;
};
/**
@ -739,7 +739,7 @@
*/
MessageViewMailBoxUserView.prototype.isSentFolder = function ()
{
return Data.message() && FolderStore.sentFolder() === Data.message().folderFullNameRaw;
return MessageStore.message() && FolderStore.sentFolder() === MessageStore.message().folderFullNameRaw;
};
/**
@ -747,7 +747,7 @@
*/
MessageViewMailBoxUserView.prototype.isSpamFolder = function ()
{
return Data.message() && FolderStore.spamFolder() === Data.message().folderFullNameRaw;
return MessageStore.message() && FolderStore.spamFolder() === MessageStore.message().folderFullNameRaw;
};
/**
@ -755,7 +755,7 @@
*/
MessageViewMailBoxUserView.prototype.isSpamDisabled = function ()
{
return Data.message() && FolderStore.spamFolder() === Consts.Values.UnuseOptionValue;
return MessageStore.message() && FolderStore.spamFolder() === Consts.Values.UnuseOptionValue;
};
/**
@ -763,7 +763,7 @@
*/
MessageViewMailBoxUserView.prototype.isArchiveFolder = function ()
{
return Data.message() && FolderStore.archiveFolder() === Data.message().folderFullNameRaw;
return MessageStore.message() && FolderStore.archiveFolder() === MessageStore.message().folderFullNameRaw;
};
/**
@ -771,7 +771,7 @@
*/
MessageViewMailBoxUserView.prototype.isArchiveDisabled = function ()
{
return Data.message() && FolderStore.archiveFolder() === Consts.Values.UnuseOptionValue;
return MessageStore.message() && FolderStore.archiveFolder() === Consts.Values.UnuseOptionValue;
};
/**
@ -789,9 +789,9 @@
MessageViewMailBoxUserView.prototype.editMessage = function ()
{
if (Data.message())
if (MessageStore.message())
{
kn.showScreenPopup(require('View/Popup/Compose'), [Enums.ComposeType.Draft, Data.message()]);
kn.showScreenPopup(require('View/Popup/Compose'), [Enums.ComposeType.Draft, MessageStore.message()]);
}
};