Merge branch 'master' of ltGuillaume/tt-rss into master

This commit is contained in:
fox 2019-04-12 07:32:02 +00:00 committed by Gogs
commit 7e55340295
2 changed files with 5 additions and 0 deletions

2
include/functions.php Executable file → Normal file
View File

@ -1203,6 +1203,7 @@
"goto_fresh" => __("Fresh"), "goto_fresh" => __("Fresh"),
"goto_marked" => __("Starred"), "goto_marked" => __("Starred"),
"goto_published" => __("Published"), "goto_published" => __("Published"),
"goto_read" => __("Recently read"),
"goto_tagcloud" => __("Tag cloud"), "goto_tagcloud" => __("Tag cloud"),
"goto_prefs" => __("Preferences")), "goto_prefs" => __("Preferences")),
__("Other") => array( __("Other") => array(
@ -1269,6 +1270,7 @@
"g f" => "goto_fresh", "g f" => "goto_fresh",
"g s" => "goto_marked", "g s" => "goto_marked",
"g p" => "goto_published", "g p" => "goto_published",
"g r" => "goto_read",
"g t" => "goto_tagcloud", "g t" => "goto_tagcloud",
"g P" => "goto_prefs", "g P" => "goto_prefs",
"r" => "select_article_cursor", "r" => "select_article_cursor",

View File

@ -416,6 +416,9 @@ require(["dojo/_base/kernel",
dijit.byId("feedTree").collapseCat(Feeds.getActive()); dijit.byId("feedTree").collapseCat(Feeds.getActive());
} }
}; };
this.hotkey_actions["goto_read"] = function () {
Feeds.open({feed: -6});
};
this.hotkey_actions["goto_all"] = function () { this.hotkey_actions["goto_all"] = function () {
Feeds.open({feed: -4}); Feeds.open({feed: -4});
}; };