Small fixes

This commit is contained in:
RainLoop Team 2016-12-15 00:56:17 +03:00
parent d3f8fa4308
commit 0e9cffd657
10 changed files with 150 additions and 89 deletions

View file

@ -149,8 +149,10 @@ class MessageUserStore
this.messageListCheckedOrSelected = ko.computed(() => {
const
checked = this.messageListChecked(),
selectedMessage = this.selectorMessageSelected();
return _.union(checked, selectedMessage ? [selectedMessage] : []);
selectedMessage = this.selectorMessageSelected(),
focusedMessage = this.selectorMessageFocused();
return _.union(checked, selectedMessage ? [selectedMessage] : [], focusedMessage ? [focusedMessage] : []);
});
this.messageListCheckedOrSelectedUidsWithSubMails = ko.computed(() => {
@ -304,7 +306,7 @@ class MessageUserStore
* @param {string} fromFolderFullNameRaw
* @param {Array} uidForRemove
* @param {string=} toFolderFullNameRaw = ''
* @param {boolean=} bCocopypy = false
* @param {boolean=} copy = false
*/
removeMessagesFromList(fromFolderFullNameRaw, uidForRemove, toFolderFullNameRaw = '', copy = false) {
@ -485,13 +487,14 @@ class MessageUserStore
}
/**
* @param {Object} oMessageTextBody
* @param {Object} messageTextBody
* @param {Object} message
*/
initOpenPgpControls(oMessageTextBody, oMessage) {
if (oMessageTextBody && oMessageTextBody.find)
initOpenPgpControls(messageTextBody, message) {
if (messageTextBody && messageTextBody.find)
{
oMessageTextBody.find('.b-plain-openpgp:not(.inited)').each(function() {
PgpStore.initMessageBodyControls($(this), oMessage); // eslint-disable-line no-invalid-this
messageTextBody.find('.b-plain-openpgp:not(.inited)').each(function() {
PgpStore.initMessageBodyControls($(this), message); // eslint-disable-line no-invalid-this
});
}
}
@ -665,7 +668,7 @@ class MessageUserStore
if (message.unseen() || message.hasUnseenSubMessage())
{
getApp().messageListAction(
message.folderFullNameRaw, message.uid, MessageSetAction.SetSeen, [message]);
message.folderFullNameRaw, MessageSetAction.SetSeen, [message]);
}
if (isNew)
@ -771,7 +774,7 @@ class MessageUserStore
}
/**
* @param {Array} aList
* @param {Array} list
* @returns {string}
*/
calculateMessageListHash(list) {