Call preventDefault() when a keyboard shortcut is executed

1 files changed, 10 insertions, 4 deletions

diff --git a/ui/static/js/keyboard_handler.js b/ui/static/js/keyboard_handler.js
index df6eefc9..e30b0ddc 100644
--- a/ui/static/js/keyboard_handler.js
+++ b/ui/static/js/keyboard_handler.js
@@ -21,14 +21,12 @@ class KeyboardHandler {
                 let keys = combination.split(" ");
 
                 if (keys.every((value, index) => value === this.queue[index])) {
-                    this.queue = [];
-                    this.shortcuts[combination](event);
+                    this.execute(combination, event);
                     return;
                 }
 
                 if (keys.length === 1 && key === keys[0]) {
-                    this.queue = [];
-                    this.shortcuts[combination](event);
+                    this.execute(combination, event);
                     return;
                 }
             }
@@ -39,6 +37,14 @@ class KeyboardHandler {
         };
     }
 
+    execute(combination, event) {
+        event.preventDefault();
+        event.stopPropagation();
+
+        this.queue = [];
+        this.shortcuts[combination](event);
+    }
+
     isEventIgnored(event) {
         return event.target.tagName === "INPUT" || event.target.tagName === "TEXTAREA";
     }