the-djmaze/snappymail
1
1
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2024-12-28 02:21:06 +08:00
Code Issues Projects Releases Packages Wiki Activity

Bugfix: message threaded mode was broken (knockout computable requires call to observable)

Browse source
This commit is contained in:
djmaze 2021-03-08 15:21:54 +01:00
parent dade7756f8
commit e2d6528bf5
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dev/Model/Message.js
View file

@ -86,7 +86,7 @@ export class MessageModel extends AbstractModel {
this.addComputables({
attachmentIconClass: () => FileInfo.getCombinedIconClass(this.hasAttachments() ? this.attachmentsSpecData() : []),
threadsLen: () => this.threads.length,
threadsLen: () => this.threads().length,
isImportant: () => MessagePriority.High === this.priority(),
});
}

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

@ -247,7 +247,6 @@ class ComposePopupView extends AbstractViewPopup {
},
attachmentsInProcess: () => this.attachments.filter(item => item && !item.complete()),
attachmentsInReady: () => this.attachments.filter(item => item && item.complete()),
attachmentsInError: () => this.attachments.filter(item => item && item.error()),
attachmentsCount: () => this.attachments.length,
@ -1318,8 +1317,8 @@ class ComposePopupView extends AbstractViewPopup {
*/
prepearAttachmentsForSendOrSave() {
const result = {};
this.attachmentsInReady().forEach(item => {
if (item && item.tempName() && item.enabled()) {
this.attachments.forEach(item => {
if (item && item.complete() && item.tempName() && item.enabled()) {
result[item.tempName()] = [item.fileName(), item.isInline ? '1' : '0', item.CID, item.contentLocation];
}
});
@ -1417,7 +1416,7 @@ class ComposePopupView extends AbstractViewPopup {
isEmptyForm(includeAttachmentInProgress = true) {
const withoutAttachment = includeAttachmentInProgress
? !this.attachments.length
: !this.attachmentsInReady().length;
: !this.attachments.some(item => item && item.complete());
return (
!this.to.length &&