Add console warning for duplicated registrations

janfaracik · Jul 12, 2022 · 3da7082 · 3da7082
1 parent 4dbc2e3
commit 3da7082
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/war/src/main/js/keyboard-shortcuts.js b/war/src/main/js/keyboard-shortcuts.js
@@ -1,5 +1,7 @@
 import hotkeys from "hotkeys-js"
 
+const registeredShortcuts = {}
+
 window.addEventListener("load", () => {
   hotkeys("*", ({key}) => {
     if (key === "Meta") {
@@ -18,11 +20,21 @@ window.addEventListener("load", () => {
   })
 
   document.querySelectorAll("[data-keyboard-shortcut]").forEach(function(element) {
-    hotkeys(translateKeyboardShortcutForOS(element.dataset.keyboardShortcut), () => {
+    const shortcut = translateKeyboardShortcutForOS(element.dataset.keyboardShortcut)
+
+    if (registeredShortcuts[shortcut]) {
+      console.warn(`Shortcut '${shortcut}' is already registered by`, element)
+      return
+    }
+
+    registeredShortcuts[shortcut] = element
+
+    hotkeys(shortcut, () => {
       // Small delay to show animation
       setTimeout(function() {
         switch (element.tagName) {
           case "A":
+          case "BUTTON":
             element.click()
             break;
           case "INPUT":

diff --git a/war/src/main/less/styles.less b/war/src/main/less/styles.less
@@ -24,7 +24,7 @@
 @import "./modules/content-blocks";
 @import "./modules/icon-size";
 @import "./modules/icons";
-@import './modules/keyboard-shortcuts';
+@import "./modules/keyboard-shortcuts";
 @import "./modules/page-footer";
 @import "./modules/page-header";
 @import "./modules/panes-and-bigtable";