Yet another attempt into fixing macos shortcuts

This commit is contained in:
mauro-balades
2024-10-08 20:31:33 +02:00
parent 66fc824bb5
commit ffe822819c
4 changed files with 32 additions and 3 deletions

View File

@@ -0,0 +1,13 @@
diff --git a/browser/base/content/browser-development-helpers.js b/browser/base/content/browser-development-helpers.js
index 5155b280b8ff1dec8c53b12861ed4401f5499659..2184440335bbbf397f14d7c5e4b099f57022d03a 100644
--- a/browser/base/content/browser-development-helpers.js
+++ b/browser/base/content/browser-development-helpers.js
@@ -33,7 +33,7 @@ var DevelopmentHelpers = {
key.setAttribute("key", "r");
key.setAttribute("modifiers", "accel,alt");
key.setAttribute("command", "cmd_quickRestart");
- document.getElementById("mainKeyset").prepend(key);
+ document.getElementById(ZEN_KEYSET_ID).prepend(key);
let menuitem = document.createXULElement("menuitem");
menuitem.setAttribute("id", "menu_FileRestartItem");

View File

@@ -0,0 +1,13 @@
diff --git a/browser/base/content/browser-sets.js b/browser/base/content/browser-sets.js
index 50da6424691ca230aa1a3a419cb69e66cf47b2c4..1f63f4bb7b75c940d5482dd4f13cebf452dddb74 100644
--- a/browser/base/content/browser-sets.js
+++ b/browser/base/content/browser-sets.js
@@ -245,7 +245,7 @@ document.addEventListener(
}
});
- document.getElementById("mainKeyset").addEventListener("command", event => {
+ document.getElementById(ZEN_KEYSET_ID).addEventListener("command", event => {
switch (event.target.id) {
case "goHome":
BrowserCommands.home();

View File

@@ -1,4 +1,7 @@
# This needs to be here, before all the other scripts, because it's used before
# the window is fully loaded.
<script src="chrome://browser/content/zen-components/ZenCommonUtils.mjs" async="true"/>
<script src="chrome://browser/content/zen-components/ZenKeyboardShortcuts.mjs" />
# Make sure they are loaded before the global-scripts.inc file.
<script type="text/javascript">
Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenCommonUtils.mjs", this);
Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenKeyboardShortcuts.mjs", this);
</script>