summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2020-05-09 07:56:06 +0300
committerAndrew Dolgov <[email protected]>2020-05-09 07:56:06 +0300
commit2558fcbe21f009e8fd9b18d9d1407bf4e6115443 (patch)
treedf60d3545b77964c75032f64e274910d10d73405
parentc8243b03c9194e6522fed4d2d582cec9f7a544d5 (diff)
add hotkey "\" to cancel current search
-rw-r--r--include/functions.php4
-rw-r--r--js/tt-rss.js3
2 files changed, 6 insertions, 1 deletions
diff --git a/include/functions.php b/include/functions.php
index fb05b0f5c..64c2074cd 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -1035,7 +1035,8 @@
"prev_article_noscroll" => __("Open previous article"),
"next_article_noexpand" => __("Move to next article (don't expand)"),
"prev_article_noexpand" => __("Move to previous article (don't expand)"),
- "search_dialog" => __("Show search dialog")),
+ "search_dialog" => __("Show search dialog"),
+ "cancel_search" => __("Cancel active search")),
__("Article") => array(
"toggle_mark" => __("Toggle starred"),
"toggle_publ" => __("Toggle published"),
@@ -1114,6 +1115,7 @@
"^(38)|Ctrl+Up" => "prev_article_noscroll",
"^(40)|Ctrl+Down" => "next_article_noscroll",
"/" => "search_dialog",
+ "\\" => "cancel_search",
"s" => "toggle_mark",
"S" => "toggle_publ",
"u" => "toggle_unread",
diff --git a/js/tt-rss.js b/js/tt-rss.js
index b57bca656..0e970205c 100644
--- a/js/tt-rss.js
+++ b/js/tt-rss.js
@@ -305,6 +305,9 @@ require(["dojo/_base/kernel",
this.hotkey_actions["search_dialog"] = function () {
Feeds.search();
};
+ this.hotkey_actions["cancel_search"] = function () {
+ Feeds.cancelSearch();
+ };
this.hotkey_actions["toggle_mark"] = function () {
Headlines.selectionToggleMarked();
};