valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pgup/pgdown hotkey normalization: 

- pgup/pgdown without modifier scroll headline buffer
- shift+pgup/pgdown work similarly to shift+up/down but operating on pages
This commit is contained in:
Andrew Dolgov 2019-12-05 17:00:02 +03:00
parent f30287be65
commit 1902a7dcb0
4 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/functions.php
View File

@ -1114,14 +1114,16 @@
"j" => "prev_feed", "j" => "prev_feed",
"n" => "next_article", "n" => "next_article",
"p" => "prev_article", "p" => "prev_article",
"(33)|PageUp" => "prev_article_page",
"(34)|PageDown" => "next_article_page",
"(38)|Up" => "prev_article", "(38)|Up" => "prev_article",
"(40)|Down" => "next_article", "(40)|Down" => "next_article",
"*(38)|Shift+Up" => "article_scroll_up", "*(38)|Shift+Up" => "article_scroll_up",
"*(40)|Shift+Down" => "article_scroll_down", "*(40)|Shift+Down" => "article_scroll_down",
"^(38)|Ctrl+Up" => "prev_article_noscroll", "^(38)|Ctrl+Up" => "prev_article_noscroll",
"^(40)|Ctrl+Down" => "next_article_noscroll", "^(40)|Ctrl+Down" => "next_article_noscroll",
"(33)|Page Up" => "article_page_up", "^(33)|Shift+PageUp" => "article_page_up",
"(34)|Page Down" => "article_page_down", "^(34)|Shift+PageDown" => "article_page_down",
"/" => "search_dialog", "/" => "search_dialog",
"s" => "toggle_mark", "s" => "toggle_mark",
"S" => "toggle_publ", "S" => "toggle_publ",

2
js/Article.js
View File

@ -314,7 +314,7 @@ define(["dojo/_base/declare"], function (declare) {
else else
return 0; return 0;
}, },
scrollPages: function (offset) { scrollByPages: function (offset) {
if (!App.isCombinedMode()) { if (!App.isCombinedMode()) {
const ci = $("content-insert"); const ci = $("content-insert");
if (ci) { if (ci) {

6
js/Headlines.js
View File

@ -1381,6 +1381,12 @@ define(["dojo/_base/declare"], function (declare) {
} }
}, },
scrollByPages: function (offset) {
const hi = $("headlines-frame");
if (hi) {
hi.scrollTop += hi.offsetHeight * offset * 0.9;
}
},
initHeadlinesMenu: function () { initHeadlinesMenu: function () {
if (!dijit.byId("headlinesMenu")) { if (!dijit.byId("headlinesMenu")) {

10
js/tt-rss.js
View File

@ -330,11 +330,17 @@ require(["dojo/_base/kernel",
this.hotkey_actions["article_scroll_up"] = function () { this.hotkey_actions["article_scroll_up"] = function () {
Article.scroll(-40); Article.scroll(-40);
}; };
this.hotkey_actions["next_article_page"] = function () {
Headlines.scrollByPages(1);
};
this.hotkey_actions["prev_article_page"] = function () {
Headlines.scrollByPages(-1);
};
this.hotkey_actions["article_page_down"] = function () { this.hotkey_actions["article_page_down"] = function () {
Article.scrollPages(1); Article.scrollByPages(1);
}; };
this.hotkey_actions["article_page_up"] = function () { this.hotkey_actions["article_page_up"] = function () {
Article.scrollPages(-1); Article.scrollByPages(-1);
}; };
this.hotkey_actions["close_article"] = function () { this.hotkey_actions["close_article"] = function () {
if (App.isCombinedMode()) { if (App.isCombinedMode()) {