From c50670fc7f507e5683184d54fd61161805dfed2d Mon Sep 17 00:00:00 2001 From: the-djmaze <> Date: Thu, 22 Dec 2022 11:40:56 +0100 Subject: [PATCH] Rename printableUnreadCount() to unreadCount() --- dev/Model/FolderCollection.js | 6 +++--- dev/View/User/MailBox/FolderList.js | 2 +- .../v/0.0.0/app/templates/Views/User/MailFolderList.html | 2 +- .../0.0.0/app/templates/Views/User/MailFolderListItem.html | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dev/Model/FolderCollection.js b/dev/Model/FolderCollection.js index c94d2b807..4ced65ccf 100644 --- a/dev/Model/FolderCollection.js +++ b/dev/Model/FolderCollection.js @@ -447,7 +447,7 @@ export class FolderModel extends AbstractModel { return folder.hasVisibleSubfolders() | visible; }, - printableUnreadCount: () => folder.unreadEmails() || null, + unreadCount: () => folder.unreadEmails() || null, /* { // TODO: make this optional in Settings @@ -482,11 +482,11 @@ export class FolderModel extends AbstractModel { hasSubscribedUnreadMessagesSubfolders: () => !!folder.subFolders().find( - folder => folder.printableUnreadCount() | folder.hasSubscribedUnreadMessagesSubfolders() + folder => folder.unreadCount() | folder.hasSubscribedUnreadMessagesSubfolders() ) /* !!folder.subFolders().filter( - folder => folder.printableUnreadCount() | folder.hasSubscribedUnreadMessagesSubfolders() + folder => folder.unreadCount() | folder.hasSubscribedUnreadMessagesSubfolders() ).length */ // ,href: () => folder.canBeSelected() && mailBox(folder.fullNameHash) diff --git a/dev/View/User/MailBox/FolderList.js b/dev/View/User/MailBox/FolderList.js index 1c6b18572..67d4a12e0 100644 --- a/dev/View/User/MailBox/FolderList.js +++ b/dev/View/User/MailBox/FolderList.js @@ -111,7 +111,7 @@ export class MailFolderList extends AbstractViewLeft { let search = ''; if (event.target.matches('.flag-icon') && !folder.isFlagged()) { search = 'flagged'; - } else if (folder.printableUnreadCount() && event.clientX > el.getBoundingClientRect().right - 25) { + } else if (folder.unreadCount() && event.clientX > el.getBoundingClientRect().right - 25) { search = 'unseen'; } hasher.setHash(mailBox(folder.fullNameHash, 1, search)); diff --git a/snappymail/v/0.0.0/app/templates/Views/User/MailFolderList.html b/snappymail/v/0.0.0/app/templates/Views/User/MailFolderList.html index 68873c320..aa4958b4c 100644 --- a/snappymail/v/0.0.0/app/templates/Views/User/MailFolderList.html +++ b/snappymail/v/0.0.0/app/templates/Views/User/MailFolderList.html @@ -11,7 +11,7 @@
  • + attr: { 'data-unread': unreadCount }"> diff --git a/snappymail/v/0.0.0/app/templates/Views/User/MailFolderListItem.html b/snappymail/v/0.0.0/app/templates/Views/User/MailFolderListItem.html index 67512a0ee..18e417992 100644 --- a/snappymail/v/0.0.0/app/templates/Views/User/MailFolderListItem.html +++ b/snappymail/v/0.0.0/app/templates/Views/User/MailFolderListItem.html @@ -2,7 +2,7 @@
  • + attr: { 'data-unread': unreadCount }">