diff options
author | Frédéric Guillot <fred@miniflux.net> | 2018-10-22 20:26:17 -0700 |
---|---|---|
committer | Frédéric Guillot <fred@miniflux.net> | 2018-10-22 20:26:17 -0700 |
commit | f06a19814bde280277d7e7309d83a4ac538840f2 (patch) | |
tree | 3bf4e6712873c0f38a45ca240fd937a87e5ec281 /ui/static/js | |
parent | 86dc2bf1c9547f92d717456d4b059bcae1c3e3d2 (diff) |
Revert "Call preventDefault() when a keyboard shortcut is executed"
This reverts commit 9440bf47a521a61c91073425bd613710cf7dd1cb.
Diffstat (limited to 'ui/static/js')
-rw-r--r-- | ui/static/js/bootstrap.js | 2 | ||||
-rw-r--r-- | ui/static/js/keyboard_handler.js | 14 | ||||
-rw-r--r-- | ui/static/js/nav_handler.js | 5 |
3 files changed, 9 insertions, 12 deletions
diff --git a/ui/static/js/bootstrap.js b/ui/static/js/bootstrap.js index 1327a22..5c0bfac 100644 --- a/ui/static/js/bootstrap.js +++ b/ui/static/js/bootstrap.js @@ -29,7 +29,7 @@ document.addEventListener("DOMContentLoaded", function() { keyboardHandler.on("f", () => navHandler.toggleBookmark()); keyboardHandler.on("?", () => navHandler.showKeyboardShortcuts()); keyboardHandler.on("#", () => navHandler.unsubscribeFromFeed()); - keyboardHandler.on("/", () => navHandler.setFocusToSearchInput()); + keyboardHandler.on("/", (e) => navHandler.setFocusToSearchInput(e)); keyboardHandler.on("Escape", () => ModalHandler.close()); keyboardHandler.listen(); diff --git a/ui/static/js/keyboard_handler.js b/ui/static/js/keyboard_handler.js index e30b0dd..df6eefc 100644 --- a/ui/static/js/keyboard_handler.js +++ b/ui/static/js/keyboard_handler.js @@ -21,12 +21,14 @@ class KeyboardHandler { let keys = combination.split(" "); if (keys.every((value, index) => value === this.queue[index])) { - this.execute(combination, event); + this.queue = []; + this.shortcuts[combination](event); return; } if (keys.length === 1 && key === keys[0]) { - this.execute(combination, event); + this.queue = []; + this.shortcuts[combination](event); return; } } @@ -37,14 +39,6 @@ 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"; } diff --git a/ui/static/js/nav_handler.js b/ui/static/js/nav_handler.js index 689f206..dd10607 100644 --- a/ui/static/js/nav_handler.js +++ b/ui/static/js/nav_handler.js @@ -1,5 +1,8 @@ class NavHandler { - setFocusToSearchInput() { + setFocusToSearchInput(event) { + event.preventDefault(); + event.stopPropagation(); + let toggleSwitchElement = document.querySelector(".search-toggle-switch"); if (toggleSwitchElement) { toggleSwitchElement.style.display = "none"; |