refactor: Disable Firefox shortcuts in ZenKeyboardShortcuts

src/ZenKeyboardShortcuts.mjs

@@ -135,10 +135,35 @@ var gZenKeyboardShortcuts = {
   _initShortcuts() {
     if (window.location.href == "chrome://browser/content/browser.xhtml") {
       Services.prefs.addObserver(kZKSStorageKey, this._initSavedShortcuts.bind(this));
+      Services.prefs.addObserver("zen.keyboard.shortcuts.disable-firefox", this._disableFirefoxShortcuts.bind(this));
       this._initSavedShortcuts();
+      this._disableFirefoxShortcuts();
     }
   },
 
+  _disableFirefoxShortcuts() {
+    let disable = Services.prefs.getBoolPref("zen.keyboard.shortcuts.disable-firefox");
+    let keySet = document.getElementById("mainKeyset");
+    if (!keySet) {
+      throw new Error("Zen CKS: No main keyset found");
+    }
+    if (disable) {
+      console.log("Zen CKS: Disabling Firefox shortcuts");
+      for (let child of keySet.children) {
+        if (!child.id.startsWith("zen-key_")) {
+          child.setAttribute("disabled", true);
+        }
+      }
+    }
+  },
+
+  _getCommandAttribute(action) {
+    if (action.startsWith("command:")) {
+      return `command="${action.substring(8)}"`;
+    }
+    return `oncommand="${action}"`;
+  },
+
   _createShortcutElement(_action) {
     let shortcut = this._savedShortcuts[_action];
     if (!shortcut) {
@@ -163,8 +188,8 @@ var gZenKeyboardShortcuts = {
         <key 
           id="zen-key_${_action}"
           class="zen-keyboard-shortcut"
-          keycode="${keycode}"
+          keycode="${key}"
-          oncommand="${action}" 
+          ${this._getCommandAttribute(action)}
           modifiers="${modifiers}"/>
       `);
     }
@@ -174,7 +199,7 @@ var gZenKeyboardShortcuts = {
         id="zen-key_${_action}"
         class="zen-keyboard-shortcut"
         key="${key}" 
-        oncommand="${action}" 
+        ${this._getCommandAttribute(action)}
         modifiers="${modifiers}"/>
     `);
   },

src/ZenThemeBuilder.mjs

@@ -3,6 +3,7 @@ const kZenAccentColorConfigKey = "zen.theme.accent-color";
 
 var gZenThemeBuilder = {
   init() {
+    return; // TODO:
     this._mouseMoveListener = this._handleThumbMouseMove.bind(this);
     setTimeout(() => {
       this._initBuilderUI();