feat: improve tab navigation and cycling

src/browser/components/preferences/zen-settings.js

@@ -778,7 +778,7 @@ var zenMissingKeyboardShortcutL10n = {
   key_zenTabNext: 'zen-key-tab-next-shortcut',
   key_zenTabPrevious: 'zen-key-tab-prev-shortcut',
   key_toggleUnloadedCycling: 'zen-toggle-unloaded-cycling-shortcut',
-  
+
   'zen-glance-expand': 'zen-glance-expand',
 
   key_selectTab1: 'zen-key-select-tab-1',
@@ -1169,7 +1169,7 @@ Preferences.addAll([
     type: 'bool',
     default: true,
   },
-    {
+  {
     id: 'zen.tabs.unloaded-navigation-mode',
     type: 'string',
     default: 'always',

src/zen/common/ZenCommonUtils.mjs

@@ -17,7 +17,7 @@ window.gZenOperatingSystemCommonUtils = {
 
 /* eslint-disable no-unused-vars */
 class nsZenMultiWindowFeature {
-  constructor() { }
+  constructor() {}
 
   static get browsers() {
     return Services.wm.getEnumerator('navigator:browser');
@@ -130,7 +130,10 @@ var gZenCommonActions = {
 
   toggleUnloadedCycling() {
     try {
-      const currentMode = Services.prefs.getStringPref('zen.tabs.unloaded-navigation-mode', 'always');
+      const currentMode = Services.prefs.getStringPref(
+        'zen.tabs.unloaded-navigation-mode',
+        'always'
+      );
       const nextMode = currentMode === 'always' ? 'never' : 'always';
       Services.prefs.setStringPref('zen.tabs.unloaded-navigation-mode', nextMode);
     } catch (e) {

src/zen/kbs/ZenKeyboardShortcuts.mjs

@@ -1084,7 +1084,9 @@ class nsZenKeyboardShortcutsVersioner {
           nsKeyShortcutModifiers.fromObject({}),
           'cmd_zenToggleUnloadedCycling',
           'zen-toggle-unloaded-cycling-shortcut'
-
+        )
+      );
+
       // 2) Add the new pin/unpin tab toggle shortcut with Ctrl+Shift+D
       data.push(
         new KeyShortcut(
@@ -1249,7 +1251,6 @@ var gZenKeyboardShortcutsManager = {
 
   _registerPrecedentShortcut(shortcut, browser) {
     const listener = (event) => {
-
       let keyMatch = false;
       if (shortcut.getKeyName()) {
         keyMatch = event.key.toLowerCase() === shortcut.getKeyName().toLowerCase();
@@ -1312,10 +1313,7 @@ var gZenKeyboardShortcutsManager = {
           continue;
         }
 
-        if (
-          key.getID() === 'zen-tab-next-shortcut' ||
-          key.getID() === 'zen-tab-prev-shortcut'
-        ) {
+        if (key.getID() === 'zen-tab-next-shortcut' || key.getID() === 'zen-tab-prev-shortcut') {
           this._registerPrecedentShortcut(key, browser);
         } else {
           let child = key.toXHTMLElement(browser);

src/zen/tests/tabs/browser_tab_unloaded_navigation.js

@@ -1,7 +1,7 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
-"use strict";
+'use strict';
 
 /**
  * Tests tab navigation between loaded/unloaded tabs based on user preference
@@ -18,32 +18,31 @@ async function createLoadedTab(url) {
     inBackground: true,
   });
 
-
   await BrowserTestUtils.browserLoaded(tab.linkedBrowser);
   return tab;
 }
 
 function createUnloadedTab(url) {
   const tab = BrowserTestUtils.addTab(gBrowser, url, {
     inBackground: true,
-    skipAnimation: true
+    skipAnimation: true,
   });
 
-  tab.linkedBrowser.setAttribute("pending", "true");
-  tab.setAttribute("pending", "true");
+  tab.linkedBrowser.setAttribute('pending', 'true');
+  tab.setAttribute('pending', 'true');
 
   info(`New unloaded tab created at index ${gBrowser.tabs.indexOf(tab)} with URL ${url}`);
   return tab;
 }
 
 function resetPreferences() {
-  Services.prefs.clearUserPref("zen.tabs.unloaded-navigation-mode");
+  Services.prefs.clearUserPref('zen.tabs.unloaded-navigation-mode');
 }
 
 async function waitForTabSelection(expectedTab) {
   await BrowserTestUtils.waitForCondition(
     () => gBrowser.selectedTab === expectedTab,
-    "Waiting for tab to be selected"
+    'Waiting for tab to be selected'
   );
 }
 
@@ -52,15 +51,15 @@ add_setup(async () => {
 });
 
 add_task(async function test_basic_unloaded_navigation() {
-  info("Basic test to verify the test infrastructure works");
+  info('Basic test to verify the test infrastructure works');
 
   const tab1 = await createLoadedTab(URL1);
   const tab2 = createUnloadedTab(URL2);
 
-  ok(tab1, "Loaded tab should be created");
-  ok(tab2, "Unloaded tab should be created");
-  is(tab2.hasAttribute("pending"), true, "Tab should have pending attribute");
-  is(tab1.hasAttribute("pending"), false, "Loaded tab should not have pending attribute");
+  ok(tab1, 'Loaded tab should be created');
+  ok(tab2, 'Unloaded tab should be created');
+  is(tab2.hasAttribute('pending'), true, 'Tab should have pending attribute');
+  is(tab1.hasAttribute('pending'), false, 'Loaded tab should not have pending attribute');
 
   BrowserTestUtils.removeTab(tab1);
   BrowserTestUtils.removeTab(tab2);
@@ -70,13 +69,15 @@ add_task(async function test_unloaded_navigation_always_mode() {
   info("Testing navigation with 'always' mode (includes unloaded tabs)");
 
   await SpecialPowers.pushPrefEnv({
-    set: [["zen.tabs.unloaded-navigation-mode", "always"]],
+    set: [['zen.tabs.unloaded-navigation-mode', 'always']],
   });
 
   const navigateAndAssert = async (direction, expectedTab, message) => {
     gBrowser.tabContainer.advanceSelectedTab(direction, false);
     await TestUtils.waitForTick();
-    info(`After navigating by ${direction}, selected tab is at index ${gBrowser.tabs.indexOf(gBrowser.selectedTab)}`);
+    info(
+      `After navigating by ${direction}, selected tab is at index ${gBrowser.tabs.indexOf(gBrowser.selectedTab)}`
+    );
     is(gBrowser.selectedTab, expectedTab, message);
   };
 
@@ -87,11 +88,13 @@ add_task(async function test_unloaded_navigation_always_mode() {
   gBrowser.selectedTab = loadedTab;
   await waitForTabSelection(loadedTab);
 
-  await navigateAndAssert(1, gBrowser.tabs[initialIndex + 1],
-    "Should navigate forward to the next tab (unloaded)");
+  await navigateAndAssert(
+    1,
+    gBrowser.tabs[initialIndex + 1],
+    'Should navigate forward to the next tab (unloaded)'
+  );
 
-  await navigateAndAssert(-1, loadedTab,
-    "Should navigate backward to the previous tab (loaded)");
+  await navigateAndAssert(-1, loadedTab, 'Should navigate backward to the previous tab (loaded)');
 
   BrowserTestUtils.removeTab(loadedTab);
   BrowserTestUtils.removeTab(unloadedTab);
@@ -103,7 +106,7 @@ add_task(async function test_unloaded_navigation_never_mode() {
   info("Testing navigation with 'never' mode (skips unloaded tabs) using URL comparison");
 
   await SpecialPowers.pushPrefEnv({
-    set: [["zen.tabs.unloaded-navigation-mode", "never"]],
+    set: [['zen.tabs.unloaded-navigation-mode', 'never']],
   });
 
   await TestUtils.waitForTick();
@@ -117,11 +120,10 @@ add_task(async function test_unloaded_navigation_never_mode() {
 
     let allTestTabs = [];
     try {
-
       // Create all the tabs required for this specific test scenario
       for (const tabConfig of setup) {
         let newTab;
-        if (tabConfig.type === "loaded") {
+        if (tabConfig.type === 'loaded') {
           newTab = await createLoadedTab(tabConfig.url);
         } else {
           newTab = createUnloadedTab(tabConfig.url);
@@ -138,9 +140,12 @@ add_task(async function test_unloaded_navigation_never_mode() {
       //trimming unnecessary about:blanks
       for (let i = gBrowser.tabs.length - 1; i >= 0; i--) {
         const tab = gBrowser.tabs[i];
-        if (tab.linkedBrowser.currentURI.spec === "about:blank" &&
-          tab.visible && !tab.hasAttribute('pending') &&
-          !allTestTabs.includes(tab)) {
+        if (
+          tab.linkedBrowser.currentURI.spec === 'about:blank' &&
+          tab.visible &&
+          !tab.hasAttribute('pending') &&
+          !allTestTabs.includes(tab)
+        ) {
           gBrowser.removeTab(tab);
         }
       }
@@ -160,10 +165,11 @@ add_task(async function test_unloaded_navigation_never_mode() {
       const finalURL = gBrowser.selectedTab.linkedBrowser.currentURI.spec;
       const finalTabIndex = gBrowser.tabs.indexOf(gBrowser.selectedTab);
 
-      info(`--> Navigation result: Started on tab ${startTabIndex} [${startURL}], ended on tab ${finalTabIndex} [${finalURL}]`);
+      info(
+        `--> Navigation result: Started on tab ${startTabIndex} [${startURL}], ended on tab ${finalTabIndex} [${finalURL}]`
+      );
 
       is(finalURL, expectedURL, description);
-
     } finally {
       // just remove all tabs created for a specific test run before moving on to the next. Trying to 'KISS'
       for (const tab of allTestTabs) {
@@ -176,41 +182,60 @@ add_task(async function test_unloaded_navigation_never_mode() {
 
   // test scenarios
   await runNavTest({
-    setup: [{ type: "loaded", url: URL1 }, { type: "unloaded", url: URL2 }, { type: "loaded", url: URL3 }],
+    setup: [
+      { type: 'loaded', url: URL1 },
+      { type: 'unloaded', url: URL2 },
+      { type: 'loaded', url: URL3 },
+    ],
     startIndex: 0,
     direction: 1,
     expectedURL: URL3,
-    description: "Should skip one unloaded tab and land on the correct URL.",
+    description: 'Should skip one unloaded tab and land on the correct URL.',
   });
 
   await runNavTest({
-    setup: [{ type: "loaded", url: URL1 }, { type: "unloaded", url: URL2 }, { type: "loaded", url: URL3 }],
+    setup: [
+      { type: 'loaded', url: URL1 },
+      { type: 'unloaded', url: URL2 },
+      { type: 'loaded', url: URL3 },
+    ],
     startIndex: 2,
     direction: -1,
     expectedURL: URL1,
-    description: "Should skip one unloaded tab backward and land on the correct URL.",
+    description: 'Should skip one unloaded tab backward and land on the correct URL.',
   });
 
   await runNavTest({
     setup: [
-      { type: "loaded", url: URL1 }, { type: "unloaded", url: URL2 }, { type: "unloaded", url: URL2 }, { type: "loaded", url: URL3 },
+      { type: 'loaded', url: URL1 },
+      { type: 'unloaded', url: URL2 },
+      { type: 'unloaded', url: URL2 },
+      { type: 'loaded', url: URL3 },
     ],
     startIndex: 0,
     direction: 1,
     expectedURL: URL3,
-    description: "Should skip multiple unloaded tabs and land on the correct URL.",
+    description: 'Should skip multiple unloaded tabs and land on the correct URL.',
   });
 
   await runNavTest({
-    setup: [{ type: "loaded", url: URL1 }, { type: "unloaded", url: URL2 }, { type: "unloaded", url: URL2 }],
+    setup: [
+      { type: 'loaded', url: URL1 },
+      { type: 'unloaded', url: URL2 },
+      { type: 'unloaded', url: URL2 },
+    ],
     startIndex: 0,
     direction: 1,
     expectedURL: URL1,
-    description: "Should not move if there is no next loaded tab.",
+    description: 'Should not move if there is no next loaded tab.',
   });
 
   await runNavTest({
-    setup: [{ type: "loaded", url: URL1 }, { type: "unloaded", url: URL2 }, { type: "loaded", url: URL3 }],
+    setup: [
+      { type: 'loaded', url: URL1 },
+      { type: 'unloaded', url: URL2 },
+      { type: 'loaded', url: URL3 },
+    ],
     startIndex: 2,
     direction: -1,
     expectedURL: URL1,

src/zen/workspaces/ZenWorkspaces.mjs

@@ -3068,4 +3068,4 @@ var gZenWorkspaces = new (class extends nsZenMultiWindowFeature {
       document.getElementById('cmd_closeWindow').doCommand();
     }
   }
-})();
+})();