mirror of
https://github.com/miniflux/v2.git
synced 2025-09-15 18:57:04 +00:00
Revert "Call preventDefault() when a keyboard shortcut is executed"
This reverts commit 9440bf47a5
.
This commit is contained in:
parent
86dc2bf1c9
commit
f06a19814b
4 changed files with 14 additions and 18 deletions
2
ui/static/js/bootstrap.js
vendored
2
ui/static/js/bootstrap.js
vendored
|
@ -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();
|
||||
|
||||
|
|
|
@ -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";
|
||||
}
|
||||
|
|
|
@ -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";
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue