summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2019-12-11 06:53:32 +0300
committerAndrew Dolgov <[email protected]>2019-12-11 06:53:32 +0300
commit0a10832491b1505bd8762d5c70feb198f4d2c757 (patch)
treead84784e646c86a92b41cc1b23eef5ac3b36e7a0 /include
parent985e11b75421d3322dcca7ae52bfdb607558dee0 (diff)
- update descriptions of changed hotkeys
- bind noscroll variants of move article hotkeys to n/p by default - update N/P (i.e. scroll article content) hotkeys to scroll by fraction of viewport height instead of hardcoded pixel distance - minor fixes w/ checking for undefined
Diffstat (limited to 'include')
-rw-r--r--include/functions.php20
1 files changed, 10 insertions, 10 deletions
diff --git a/include/functions.php b/include/functions.php
index e031ac8c4..a7c55f486 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -1041,10 +1041,10 @@
__("Navigation") => array(
"next_feed" => __("Open next feed"),
"prev_feed" => __("Open previous feed"),
- "next_article" => __("Open next article (scroll long articles)"),
- "prev_article" => __("Open previous article (scroll long articles)"),
- "next_article_page" => __("Open next article (scroll down page)"),
- "prev_article_page" => __("Open previous article (scroll up page)"),
+ "next_article_or_scroll" => __("Open next article (in combined mode, scroll down)"),
+ "prev_article_or_scroll" => __("Open previous article (in combined mode, scroll up)"),
+ "next_article_page" => __("Scroll article by one page down"),
+ "prev_article_page" => __("Scroll article by one page up"),
"next_article_noscroll" => __("Open next article"),
"prev_article_noscroll" => __("Open previous article"),
"next_article_noexpand" => __("Move to next article (don't expand or mark read)"),
@@ -1116,14 +1116,14 @@
$hotkeys = array(
"k" => "next_feed",
"j" => "prev_feed",
- "n" => "next_article",
- "p" => "prev_article",
+ "n" => "next_article_noscroll",
+ "p" => "prev_article_noscroll",
//"(33)|PageUp" => "prev_article_page",
//"(34)|PageDown" => "next_article_page",
- "*(33)|Shift+PageUp" => "article_page_up",
- "*(34)|Shift+PageDown" => "article_page_down",
- "(38)|Up" => "prev_article",
- "(40)|Down" => "next_article",
+ "*(33)|Shift+PgUp" => "article_page_up",
+ "*(34)|Shift+PgDn" => "article_page_down",
+ "(38)|Up" => "prev_article_or_scroll",
+ "(40)|Down" => "next_article_or_scroll",
"*(38)|Shift+Up" => "article_scroll_up",
"*(40)|Shift+Down" => "article_scroll_down",
"^(38)|Ctrl+Up" => "prev_article_noscroll",