Refactor ZenKeyboardShortcuts to fix target shortcut identification

This commit is contained in:
mauro-balades 2024-09-24 21:30:28 +02:00
parent b10313ac47
commit 57b68599e9

View file

@ -823,7 +823,7 @@ var gZenKeyboardShortcutsManager = {
// Unsetting shortcut // Unsetting shortcut
for (let targetShortcut of this._currentShortcutList) { for (let targetShortcut of this._currentShortcutList) {
if (targetShortcut.getAction() != action) { if (targetShortcut.getID() != action) {
continue; continue;
} }
if (!shortcut && !modifiers) { if (!shortcut && !modifiers) {
@ -854,10 +854,9 @@ var gZenKeyboardShortcutsManager = {
return rv; return rv;
}, },
checkForConflicts(shortcut, modifiers, id, action) { checkForConflicts(shortcut, modifiers, id) {
for (let targetShortcut of this._currentShortcutList) { for (let targetShortcut of this._currentShortcutList) {
if ((targetShortcut.getID() == id) if (targetShortcut.getID() == id) {
|| (action == targetShortcut.getAction())) {
continue; continue;
} }