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

Merge some parts of initByJson and initUpdateByMessageJson

Browse source 
Cleanup messageListChecked handling
This commit is contained in:
djmaze 2020-09-20 11:29:31 +02:00
parent 46198861bc
commit b66e68a3b1
8 changed files with 46 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -64,7 +64,7 @@ class AddOpenPgpKeyPopupView extends AbstractViewNext {
}
}
count -= 1;
--count;
done = false;
} else {
done = true;

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

@ -449,7 +449,7 @@ class ContactsPopupView extends AbstractViewNext {
}
contact.deleted(true);
count -= 1;
--count;
});
if (0 >= count) {

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

@ -98,7 +98,6 @@ class MessageListMailBoxUserView extends AbstractViewNext {
this.messageListEndFolder = MessageStore.messageListEndFolder;
this.messageListEndThreadUid = MessageStore.messageListEndThreadUid;
this.messageListChecked = MessageStore.messageListChecked;
this.messageListCheckedOrSelected = MessageStore.messageListCheckedOrSelected;
this.messageListCheckedOrSelectedUidsWithSubMails = MessageStore.messageListCheckedOrSelectedUidsWithSubMails;
this.messageListCompleteLoadingThrottle = MessageStore.messageListCompleteLoadingThrottle;
@ -195,11 +194,10 @@ class MessageListMailBoxUserView extends AbstractViewNext {
() => this.isSpamFolder() && !this.isSpamDisabled() && !this.isDraftFolder() && !this.isSentFolder()
);
this.mobileCheckedStateShow = ko.computed(() => {
return this.mobile ? 0 < this.messageListChecked().length : true;
});
// this.messageListChecked = MessageStore.messageListChecked;
this.mobileCheckedStateShow = ko.computed(() => this.mobile ? 0 < MessageStore.messageListChecked().length : true);
this.mobileCheckedStateHide = ko.computed(() => this.mobile ? !this.messageListChecked().length : true);
this.mobileCheckedStateHide = ko.computed(() => this.mobile ? !MessageStore.messageListChecked().length : true);
this.messageListFocused = ko.computed(() => Focused.MessageList === AppStore.focusedState());
@ -376,7 +374,7 @@ class MessageListMailBoxUserView extends AbstractViewNext {
}
goToUpUpOrDownDown(up) {
if (this.messageListChecked().length) {
if (MessageStore.messageListChecked().length) {
return false;
}
@ -488,6 +486,7 @@ class MessageListMailBoxUserView extends AbstractViewNext {
dragImage || (dragImage = document.getElementById('messagesDragImage'));
const uids = MessageStore.messageListCheckedOrSelectedUidsWithSubMails();
item && !uids.includes(item.uid) && uids.push(item.uid);
if (dragImage && uids.length) {
dragImage.querySelector('.text').textContent = uids.length;
let img = dragImage.querySelector('.icon-white');
@ -544,7 +543,7 @@ class MessageListMailBoxUserView extends AbstractViewNext {
if (folder) {
MessageStore.messageList().forEach(message => {
if (message.unseen()) {
cnt += 1;
++cnt;
}
message.unseen(false);
@ -570,7 +569,7 @@ class MessageListMailBoxUserView extends AbstractViewNext {
if (folder) {
MessageStore.messageList().forEach(message => {
if (!message.unseen()) {
cnt += 1;
++cnt;
}
message.unseen(true);

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

@ -92,7 +92,7 @@ class MessageViewMailBoxUserView extends AbstractViewNext {
this.attachmentsActions = AppStore.attachmentsActions;
this.message = MessageStore.message;
this.messageListChecked = MessageStore.messageListChecked;
// this.messageListChecked = MessageStore.messageListChecked;
this.hasCheckedMessages = MessageStore.hasCheckedMessages;
this.messageListCheckedOrSelectedUidsWithSubMails = MessageStore.messageListCheckedOrSelectedUidsWithSubMails;
this.messageLoadingThrottle = MessageStore.messageLoadingThrottle;
@ -410,7 +410,7 @@ class MessageViewMailBoxUserView extends AbstractViewNext {
index = listIndex;
}
listIndex += 1;
++listIndex;
return {
src: item.linkPreview(),