mirrors/desktop
1
0
Fork 0
mirror of https://github.com/zen-browser/desktop.git synced 2025-09-05 19:08:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor keyboard shortcut validation logic to simplify parsing and remove obsolete checks

Browse Source
This commit is contained in:
mr. M
2025-01-12 12:43:47 +01:00
parent f61feb54d4
commit 14664bd38f
1 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/browser/base/zen-components/ZenKeyboardShortcuts.mjs
View File

@@ -315,12 +315,7 @@ class KeyShortcut {
static parseFromSaved(json) {
let rv = [];
for (let key of json) {
if (this.#shortcutIsValid(key)) {
rv.push(this.#parseFromJSON(key));
} else {
console.warn('[zen CKS]: Invalid shortcut', key['id']);
throw new Error('Invalid shortcut found');
}
rv.push(this.#parseFromJSON(key));
}
return rv;
@@ -338,12 +333,6 @@ class KeyShortcut {
return 'other';
}
static #shortcutIsValid(shortcut) {
// See https://github.com/zen-browser/desktop/issues/4071, some *old* shortcuts dont have
// any of `key`, `keycode`, `l10nId`. This fix also allows us to avoid any future issues
return !(shortcut['key'] == '' && shortcut['keycode'] == '' && shortcut['l10nId'] == null);
}
static #parseFromJSON(json) {
return new KeyShortcut(
json['id'],
@@ -1071,7 +1060,7 @@ var gZenKeyboardShortcutsManager = {
//}
for (let key of this._currentShortcutList) {
if (key.isEmpty() || key.isInternal() || key.isInvalid()) {
if (key.isInternal()) {
continue;
}
let child = key.toXHTMLElement(browser);