From 59641cb952b906128c8b5b0cb4aca377126732e3 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Sun, 23 Nov 2025 02:03:03 +0100
Subject: [PATCH] fix: Fixed KBS settings page, b=no-bug, c=kbs

---
 src/browser/components/preferences/zen-settings.js            | 4 ++++
 .../components/preferences/zenKeyboardShortcuts.inc.xhtml     | 1 -
 src/zen/kbs/ZenKeyboardShortcuts.mjs                          | 4 ++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/browser/components/preferences/zen-settings.js b/src/browser/components/preferences/zen-settings.js
index 6bad8d201..5da77ca5f 100644
--- a/src/browser/components/preferences/zen-settings.js
+++ b/src/browser/components/preferences/zen-settings.js
@@ -8,6 +8,10 @@ const { nsZenMultiWindowFeature } = ChromeUtils.importESModule(
   { global: 'current' }
 );
 
+ChromeUtils.importESModule('chrome://browser/content/zen-components/ZenKeyboardShortcuts.mjs', {
+  global: 'current',
+});
+
 var gZenMarketplaceManager = {
   async init() {
     const checkForUpdates = document.getElementById('zenThemeMarketplaceCheckForUpdates');
diff --git a/src/browser/components/preferences/zenKeyboardShortcuts.inc.xhtml b/src/browser/components/preferences/zenKeyboardShortcuts.inc.xhtml
index efbb535e7..3a0a1f740 100644
--- a/src/browser/components/preferences/zenKeyboardShortcuts.inc.xhtml
+++ b/src/browser/components/preferences/zenKeyboardShortcuts.inc.xhtml
@@ -2,7 +2,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-<script type="module" src="chrome://browser/content/zen-components/ZenKeyboardShortcuts.mjs"/>
 <html:template id="template-paneZenCKS">
 <hbox id="ZenCKSCategory"
       class="subcategory"
diff --git a/src/zen/kbs/ZenKeyboardShortcuts.mjs b/src/zen/kbs/ZenKeyboardShortcuts.mjs
index d2c6f3d78..c42f3f174 100644
--- a/src/zen/kbs/ZenKeyboardShortcuts.mjs
+++ b/src/zen/kbs/ZenKeyboardShortcuts.mjs
@@ -132,7 +132,7 @@ const ZEN_WORKSPACE_SHORTCUTS_GROUP = 'zen-workspace';
 const ZEN_OTHER_SHORTCUTS_GROUP = 'zen-other';
 const ZEN_SPLIT_VIEW_SHORTCUTS_GROUP = 'zen-split-view';
 const FIREFOX_SHORTCUTS_GROUP = 'zen-kbs-invalid';
-const VALID_SHORTCUT_GROUPS = [
+window.VALID_SHORTCUT_GROUPS = [
   ZEN_COMPACT_MODE_SHORTCUTS_GROUP,
   ZEN_WORKSPACE_SHORTCUTS_GROUP,
   ZEN_SPLIT_VIEW_SHORTCUTS_GROUP,
@@ -322,7 +322,7 @@ class KeyShortcut {
     this.#key = key?.toLowerCase();
     this.#keycode = keycode;
 
-    if (!VALID_SHORTCUT_GROUPS.includes(group)) {
+    if (!window.VALID_SHORTCUT_GROUPS.includes(group)) {
       throw new Error('Illegal group value: ' + group);
     }