Skip to content

Commit 6baa30a

Browse files
authored
Merge pull request #12041 from nextcloud/fix/apply-seen-thread
fix(envelope): apply read/unread for whole thread
2 parents b83378c + 04141fb commit 6baa30a

File tree

1 file changed

+12
-20
lines changed

1 file changed

+12
-20
lines changed

src/components/Envelope.vue

Lines changed: 12 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -942,20 +942,12 @@ export default {
942942
break
943943
case 'markAsRead':
944944
if (!this.data.flags.seen) {
945-
if (this.layoutMessageViewThreaded) {
946-
this.onToggleSeenThread()
947-
} else {
948-
this.onToggleSeen()
949-
}
945+
this.onToggleSeen()
950946
}
951947
break
952948
case 'markAsUnread':
953949
if (this.data.flags.seen) {
954-
if (this.layoutMessageViewThreaded) {
955-
this.onToggleSeenThread()
956-
} else {
957-
this.onToggleSeen()
958-
}
950+
this.onToggleSeen()
959951
}
960952
break
961953
case 'moveThread':
@@ -1050,16 +1042,16 @@ export default {
10501042
},
10511043
10521044
onToggleSeen() {
1053-
this.mainStore.toggleEnvelopeSeen({ envelope: this.data })
1054-
},
1055-
1056-
onToggleSeenThread() {
1057-
const threadEnvelopes = this.layoutMessageViewThreaded
1058-
? this.mainStore.getEnvelopesByThreadRootId(this.data.accountId, this.data.threadRootId)
1059-
: [this.data]
1060-
threadEnvelopes.forEach((envelope) => {
1061-
this.mainStore.toggleEnvelopeSeen({ envelope })
1062-
})
1045+
if (this.layoutMessageViewThreaded) {
1046+
const threadEnvelopes = this.layoutMessageViewThreaded
1047+
? this.mainStore.getEnvelopesByThreadRootId(this.data.accountId, this.data.threadRootId)
1048+
: [this.data]
1049+
threadEnvelopes.forEach((envelope) => {
1050+
this.mainStore.toggleEnvelopeSeen({ envelope })
1051+
})
1052+
} else {
1053+
this.mainStore.toggleEnvelopeSeen({ envelope: this.data })
1054+
}
10631055
},
10641056
10651057
async onToggleJunkThread() {

0 commit comments

Comments
 (0)