From db225c3c7ef76d4b23dd8b7c9eab967fabbfaab1 Mon Sep 17 00:00:00 2001 From: Shiandow Date: Tue, 22 Dec 2020 18:53:00 +0100 Subject: [PATCH 1/2] Add option to mark all items read --- _locales/en/messages.json | 3 +++ background/background.js | 18 ++++++++++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/_locales/en/messages.json b/_locales/en/messages.json index ad3ac44f..517a2c96 100644 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -8,6 +8,9 @@ "openAllUnreadPages": { "message": "Open all unread pages" }, + "markAllRead": { + "message": "Mark all as read" + }, "openSiteUrl": { "message": "Open \"$site$\"", "placeholders": { diff --git a/background/background.js b/background/background.js index 96259bd5..15b7c36e 100644 --- a/background/background.js +++ b/background/background.js @@ -323,6 +323,17 @@ const ContextMenu = { } } }); + + this.markAllReadItemId = await browser.menus.create({ + contexts: ["bookmark"], + title: browser.i18n.getMessage("markAllRead"), + async onclick({bookmarkId}) { + const unreadBookmarks = await getUnreadChildren(bookmarkId); + for (let bookmark of unreadBookmarks) { + browser.history.addUrl({url: bookmark.url}); + } + } + }); }; browser.menus.onShown.addListener(async ({bookmarkId}) => { @@ -335,11 +346,14 @@ const ContextMenu = { await createItems(); } - // Disable "Open all unread pages in tabs" if all feeds are already - // read/visited. + // Disable "Open all unread pages in tabs" and "Mark all as read" + // if all feeds are already read/visited. browser.menus.update(this.openUnreadItemId, { enabled: (await getUnreadChildren(bookmarkId)).length >= 1 }); + browser.menus.update(this.markAllReadItemId, { + enabled: (await getUnreadChildren(bookmarkId)).length >= 1 + }); } await browser.menus.refresh(); }); From cc534bdb2301adb395d6aaa93dbb2cea797a52df Mon Sep 17 00:00:00 2001 From: Shiandow Date: Tue, 29 Dec 2020 15:00:57 +0000 Subject: [PATCH 2/2] Avoid fetching the children twice Suggested nt1m Co-authored-by: Tim Nguyen --- background/background.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/background/background.js b/background/background.js index 15b7c36e..7e94cf88 100644 --- a/background/background.js +++ b/background/background.js @@ -346,13 +346,14 @@ const ContextMenu = { await createItems(); } + const hasUnreadChildren = (await getUnreadChildren(bookmarkId)).length >= 1; // Disable "Open all unread pages in tabs" and "Mark all as read" // if all feeds are already read/visited. browser.menus.update(this.openUnreadItemId, { - enabled: (await getUnreadChildren(bookmarkId)).length >= 1 + enabled: hasUnreadChildren }); browser.menus.update(this.markAllReadItemId, { - enabled: (await getUnreadChildren(bookmarkId)).length >= 1 + enabled: hasUnreadChildren }); } await browser.menus.refresh();