Merge pull request #5648 from NadavTasher/bugfix/keyboard-shortcuts-behaving-differently-with-caps

Fix upper-case keyboard shortcuts & different language shortcuts getting triggered when shortcuts are disabled
This commit is contained in:
Lauri Ojansivu 2024-12-31 22:54:35 +02:00 committed by GitHub
commit 43e15a1ef4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -11,13 +11,13 @@ window.addEventListener('keydown', (e) => {
if (String.fromCharCode(e.which).toLowerCase() === e.key) return;
// Trigger the corresponding action
Mousetrap.trigger(String.fromCharCode(e.which).toLowerCase());
Mousetrap.handleKey(String.fromCharCode(e.which).toLowerCase(), [], {type: "keypress"});
});
// Overwrite the stopCallback to allow for more keyboard shortcut customizations
Mousetrap.stopCallback = (event, element) => {
// Are shortcuts enabled for the user?
if (!ReactiveCache.getCurrentUser().isKeyboardShortcuts())
if (ReactiveCache.getCurrentUser() && !ReactiveCache.getCurrentUser().isKeyboardShortcuts())
return true;
// Always handle escape