From 05d658c6bc0fd66c85035e104155c4c3eabcdd40 Mon Sep 17 00:00:00 2001 From: mauro-balades Date: Wed, 25 Sep 2024 17:16:03 +0200 Subject: [PATCH] Refactor ZenKeyboardShortcuts to add support for accelerator keys in constructor --- src/ZenKeyboardShortcuts.mjs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/ZenKeyboardShortcuts.mjs b/src/ZenKeyboardShortcuts.mjs index 7e8975a..44245e6 100644 --- a/src/ZenKeyboardShortcuts.mjs +++ b/src/ZenKeyboardShortcuts.mjs @@ -115,13 +115,14 @@ class KeyShortcutModifiers { #meta = false; #accel = false; - constructor(ctrl, alt, shift, meta, accel) { + constructor(ctrl, alt, shift, meta, accel, fromXHTML = false) { this.#control = ctrl; this.#alt = alt; this.#shift = shift; this.#meta = meta; this.#accel = accel; - if (AppConstants.platform != 'macosx') { + + if (AppConstants.platform != 'macosx' || !fromXHTML) { // Replace control with accel, to make it more consistent this.#accel = ctrl || accel; this.#control = false; @@ -152,7 +153,8 @@ class KeyShortcutModifiers { modifiers.includes('alt'), modifiers.includes('shift'), modifiers.includes('meta'), - modifiers.includes('accel') + modifiers.includes('accel'), + true ); }