Refactor ZenCustomizableUI.sys.mjs and zen-sidebar-icons.inc.xhtml

This commit is contained in:
mauro-balades
2024-09-28 22:10:37 +02:00
parent ffcf2a040c
commit 4d019067ef
4 changed files with 7 additions and 13 deletions

View File

@@ -18,7 +18,8 @@ export var ZenCustomizableUI = new class {
"preferences-button", "zen-expand-sidebar-button", "zen-profile-button"
],
defaultCollapsed: null,
}
},
true
);
CustomizableUIInternal.registerArea(
"zen-sidebar-icons-wrapper",
@@ -26,7 +27,8 @@ export var ZenCustomizableUI = new class {
type: this.TYPE_TOOLBAR,
defaultPlacements: this.defaultSidebarIcons,
defaultCollapsed: null,
}
},
true
);
}
@@ -44,7 +46,6 @@ export var ZenCustomizableUI = new class {
brighttext="true"
data-l10n-id="tabs-toolbar"
customizable="true"
toolbarname="Zen Sidebar Top Buttons"
context="toolbar-context-menu"
flex="1"
skipintoolbarset="true"

View File

@@ -4,7 +4,7 @@
class="browser-toolbar customization-target zen-dont-hide-on-fullscreen"
data-l10n-id="tabs-toolbar"
customizable="true"
toolbarname="Zen Sidebar Icons"
skipintoolbarset="true"
context="toolbar-context-menu"
mode="icons">
<toolbarbutton removeable="true" class="toolbarbutton-1 zen-sidebar-action-button" id="zen-sidepanel-button" data-l10n-id="sidebar-zen-sidepanel" onclick="gZenBrowserManagerSidebar.toggle();"></toolbarbutton>

View File

@@ -806,14 +806,7 @@ var gZenCKSSettings = {
event.preventDefault();
let input = document.querySelector(`.${ZEN_CKS_INPUT_FIELD_CLASS}[${KEYBIND_ATTRIBUTE_KEY}="${this._currentActionID}"]`);
let accelKey = false;
let controlKey = false;
if (AppConstants.platform === 'macosx') {
accelKey = event.ctrlKey;
} else {
accelKey = event.ctrlKey;
}
const modifiers = new KeyShortcutModifiers(controlKey, event.altKey, event.shiftKey, event.metaKey, accelKey);
const modifiers = new KeyShortcutModifiers(event.ctrlKey, event.altKey, event.shiftKey, event.metaKey, false);
const modifiersActive = modifiers.areAnyActive();
let shortcut = event.key;