diff --git a/locales/en-US/browser/browser/preferences/zen-preferences.ftl b/locales/en-US/browser/browser/preferences/zen-preferences.ftl index b403bad5a..62f8eebd9 100644 --- a/locales/en-US/browser/browser/preferences/zen-preferences.ftl +++ b/locales/en-US/browser/browser/preferences/zen-preferences.ftl @@ -283,7 +283,8 @@ zen-page-info-shortcut = View Page Info zen-find-shortcut = Find on Page zen-search-find-again-shortcut = Find Again zen-search-find-again-shortcut-prev = Find Previous -zen-search-find-again-shortcut-2 = Find Again (Alt) +zen-search-find-again-shortcut-alt = Find Again (Alt) +zen-search-find-again-shortcut-prev-alt = Find Previous (Alt) zen-bookmark-this-page-shortcut = Bookmark This Page zen-bookmark-show-library-shortcut = Show Bookmarks Library zen-key-stop = Stop Loading diff --git a/src/browser/components/preferences/zen-settings.js b/src/browser/components/preferences/zen-settings.js index c048ecffa..73d5663cf 100644 --- a/src/browser/components/preferences/zen-settings.js +++ b/src/browser/components/preferences/zen-settings.js @@ -803,6 +803,7 @@ const zenMissingKeyboardShortcutL10n = { key_inspectorMac: "zen-key-inspector-mac", key_findSelection: "zen-key-find-selection", + key_findPrevious2: "zen-search-find-again-shortcut-prev-alt", // Devtools key_toggleToolbox: "zen-devtools-toggle-shortcut", @@ -826,6 +827,9 @@ var zenIgnoreKeyboardShortcutIDs = [ "key_exitFullScreen_old", "key_exitFullScreen_compat", "key_duplicateTab", + "key_addTabSplitView", + "key_separateTabSplitView", + "viewOpenTabsSidebarKb", ]; var zenIgnoreKeyboardShortcutL10n = [ diff --git a/src/zen/kbs/ZenKeyboardShortcuts.mjs b/src/zen/kbs/ZenKeyboardShortcuts.mjs index c78f9993b..620e87a6d 100644 --- a/src/zen/kbs/ZenKeyboardShortcuts.mjs +++ b/src/zen/kbs/ZenKeyboardShortcuts.mjs @@ -85,9 +85,10 @@ const defaultKeyboardGroups = { "zen-search-focus-shortcut", "zen-search-focus-shortcut-alt", "zen-find-shortcut", - "zen-search-find-again-shortcut-2", "zen-search-find-again-shortcut", + "zen-search-find-again-shortcut-alt", "zen-search-find-again-shortcut-prev", + "zen-search-find-again-shortcut-prev-alt", ], pageOperations: [ "zen-text-action-copy-url-markdown-shortcut", @@ -893,7 +894,7 @@ class nsZenKeyboardShortcutsLoader { } class nsZenKeyboardShortcutsVersioner { - static LATEST_KBS_VERSION = 19; + static LATEST_KBS_VERSION = 20; constructor() {} @@ -1301,6 +1302,24 @@ class nsZenKeyboardShortcutsVersioner { } } + if (version < 20) { + // Migrate from version 19 to 20. + // - Disable "key_addTabSplitView" and "key_separateTabSplitView" + // since we already had "cmd_zenNewEmptySplit" and "cmd_zenSplitViewUnsplit" before Firefox 153. + // - Disable firefox's "viewOpenTabsSidebarKb" as it depends on firefox's native sidebar feature + const shouldBeDisabledShortcuts = [ + "key_addTabSplitView", + "key_separateTabSplitView", + "viewOpenTabsSidebarKb", + ]; + for (let shortcut of data) { + if (shouldBeDisabledShortcuts.includes(shortcut.getID())) { + shortcut.shouldBeEmpty = true; + shortcut.setDisabled(true); + } + } + } + return data; } }