Feat/cycle tabs (#14)

* Add tab cycling Add cycling behaviour for iterating recently audible tabs from oldest-newest, or newest-oldest. Add the hotkeys for this cycling behaviour. * Fix tab cycling from toolbar
Rainyan · Nov 12, 2023 · 78bd92e · 78bd92e
1 parent 86594ec
commit 78bd92e
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 10 deletions.
diff --git a/jump_to_audio_tab.js b/jump_to_audio_tab.js
@@ -10,12 +10,25 @@ function errorLog() {
   console.error(arguments);
 }
 
-function jumpToLatestAudibleTab() {
-  let targetTabs = AUDIBLE_TABS.sort((a, b) => b.lastAccessed - a.lastAccessed);
-  if (targetTabs.length === 0) {
+function negativeMod(dividend, divisor) {
+  return ((dividend % divisor) + divisor) % divisor;
+}
+
+function jumpToRecentlyAudibleTab(currentTab, offset) {
+  if (AUDIBLE_TABS.length === 0) {
     return;
   }
-  let targetTabId = targetTabs[0].id;
+
+  var index = AUDIBLE_TABS.findIndex((a) => a.id === currentTab.id);
+  if (index === -1) {
+    index = offset < 0 ? 0 : AUDIBLE_TABS.length - 1;
+  } else {
+    index = negativeMod(index + offset, AUDIBLE_TABS.length);
+  }
+  console.assert(index >= 0);
+  console.assert(index < AUDIBLE_TABS.length);
+
+  let targetTabId = AUDIBLE_TABS[index].id;
   console.assert(targetTabId !== -1);
 
   browser.tabs.update(targetTabId, { active: true }).then(() => {
@@ -50,13 +63,26 @@ function jumpToLatestAudibleTab() {
 }
 
 browser.commands.onCommand.addListener((command) => {
-  if (command === "jump-to-latest-audible-tab") {
-    jumpToLatestAudibleTab();
+  let offsets = {
+    "jump-to-latest-audible-tab-next": 1,
+    "jump-to-latest-audible-tab-prev": -1,
+  };
+  if (command in offsets) {
+    browser.tabs
+      .query({ active: true, currentWindow: true })
+      .catch((e) => {
+        console.error(e);
+      })
+      .then((tabs) => {
+        if (tabs.length === 1) {
+          jumpToRecentlyAudibleTab(tabs[0], offsets[command]);
+        }
+      });
   }
 });
 
 browser.browserAction.onClicked.addListener((tab, info) => {
-  jumpToLatestAudibleTab();
+  jumpToRecentlyAudibleTab(tab, -1);
 });
 
 browser.contextMenus.onClicked.addListener((info, tab) => {

diff --git a/manifest.json b/manifest.json
@@ -1,7 +1,7 @@
 {
     "manifest_version":2,
     "name":"Jump to Audible Tabs",
-    "version":"0.3.0",
+    "version":"0.4.0",
     "description":"Jump to tabs that are playing audio. Activate with the mouse right-click context menu.",
     "icons":{
         "48":"icons/Volume_Mute.svg",
@@ -28,11 +28,17 @@
         }
     },
     "commands": {
-        "jump-to-latest-audible-tab": {
+        "jump-to-latest-audible-tab-prev": {
             "suggested_key": {
                 "default": "Alt+J"
             },
-            "description": "Jump to latest audible tab"
+            "description": "Jump to a recently audible tab, from newest to oldest"
+        },
+		"jump-to-latest-audible-tab-next": {
+            "suggested_key": {
+                "default": "Shift+Alt+J"
+            },
+            "description": "Jump to a recently audible tab, from oldest to newest"
         }
     }
 }