From 7c928ee78e901871df9d3dcb879f6018c59a689d Mon Sep 17 00:00:00 2001 From: the-djmaze <> Date: Tue, 27 Dec 2022 21:34:32 +0100 Subject: [PATCH] When sorting on FROM also sort on REVERSE DATE --- dev/View/User/MailBox/MessageList.js | 30 +++++++++---------- .../templates/Views/User/MailMessageList.html | 4 +-- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dev/View/User/MailBox/MessageList.js b/dev/View/User/MailBox/MessageList.js index 7eaba571c..f50fbeeed 100644 --- a/dev/View/User/MailBox/MessageList.js +++ b/dev/View/User/MailBox/MessageList.js @@ -150,12 +150,25 @@ export class MailMessageList extends AbstractViewRight { listGrouped: () => { let uid = MessagelistUserStore.threadUid(), sort = FolderUserStore.sortMode() || 'DATE'; - return SettingsUserStore.listGrouped() && (sort.includes('DATE') || sort.includes('FROM')) && !uid; + return SettingsUserStore.listGrouped() && sort.includes('DATE') && !uid; }, groupedList: () => { let list = [], current, sort = FolderUserStore.sortMode() || 'DATE'; - if (sort.includes('DATE')) { + if (sort.includes('FROM')) { + MessagelistUserStore.forEach(msg => { + let email = msg.from[0].email; + if (!current || email != current.id) { + current = { + id: email, + label: msg.from[0].toLine(), + messages: [] + }; + list.push(current); + } + current.messages.push(msg); + }); + } else if (sort.includes('DATE')) { let today = Ymd(new Date()), rtf = Intl.RelativeTimeFormat ? new Intl.RelativeTimeFormat(doc.documentElement.lang, { numeric: "auto" }) : 0; @@ -183,19 +196,6 @@ export class MailMessageList extends AbstractViewRight { } current.messages.push(msg); }); - } else if (sort.includes('FROM')) { - MessagelistUserStore.forEach(msg => { - let email = msg.from[0].email; - if (!current || email != current.id) { - current = { - id: email, - label: msg.from[0].toLine(), - messages: [] - }; - list.push(current); - } - current.messages.push(msg); - }); } return list; }, diff --git a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html index 59b3cd681..127f19210 100644 --- a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html +++ b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html @@ -93,10 +93,10 @@