summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfox <[email protected]>2019-04-12 07:32:02 +0000
committerGogs <[email protected]>2019-04-12 07:32:02 +0000
commit7e55340295d7c3f7d1fded0c8d07700b908b57f2 (patch)
treecf5b39506b6ca41853e4f057cbf7e75c0c717b41
parent6fbf349155ff92c643d835246016a76351417cf1 (diff)
parent3d8c6967dabeba6d568845a278a074762ccce921 (diff)
Merge branch 'master' of ltGuillaume/tt-rss into master
-rw-r--r--[-rwxr-xr-x]include/functions.php2
-rw-r--r--js/tt-rss.js3
2 files changed, 5 insertions, 0 deletions
diff --git a/include/functions.php b/include/functions.php
index c09e62cca..963018858 100755..100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -1203,6 +1203,7 @@
"goto_fresh" => __("Fresh"),
"goto_marked" => __("Starred"),
"goto_published" => __("Published"),
+ "goto_read" => __("Recently read"),
"goto_tagcloud" => __("Tag cloud"),
"goto_prefs" => __("Preferences")),
__("Other") => array(
@@ -1269,6 +1270,7 @@
"g f" => "goto_fresh",
"g s" => "goto_marked",
"g p" => "goto_published",
+ "g r" => "goto_read",
"g t" => "goto_tagcloud",
"g P" => "goto_prefs",
"r" => "select_article_cursor",
diff --git a/js/tt-rss.js b/js/tt-rss.js
index a46fc17e4..eaedecd22 100644
--- a/js/tt-rss.js
+++ b/js/tt-rss.js
@@ -416,6 +416,9 @@ require(["dojo/_base/kernel",
dijit.byId("feedTree").collapseCat(Feeds.getActive());
}
};
+ this.hotkey_actions["goto_read"] = function () {
+ Feeds.open({feed: -6});
+ };
this.hotkey_actions["goto_all"] = function () {
Feeds.open({feed: -4});
};