Przeglądaj źródła

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
Lauri Ojansivu 5 miesięcy temu
rodzic
commit
43e15a1ef4
1 zmienionych plików z 2 dodań i 2 usunięć
  1. 2 2
      client/lib/keyboard.js

+ 2 - 2
client/lib/keyboard.js

@@ -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