diff options
| -rw-r--r-- | backend.php | 3 | ||||
| -rw-r--r-- | feedlist.js | 23 | ||||
| -rw-r--r-- | tt-rss.js | 12 | ||||
| -rw-r--r-- | viewfeed.js | 22 |
4 files changed, 51 insertions, 9 deletions
diff --git a/backend.php b/backend.php index f571f8ba0..77812b981 100644 --- a/backend.php +++ b/backend.php @@ -469,7 +469,7 @@ <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"> <script type=\"text/javascript\" src=\"functions.js\"></script> <script type=\"text/javascript\" src=\"viewfeed.js\"></script> - </head><body>"; + </head><body onload='init()'>"; } if ($subop == "ForceUpdate" && sprintf("%d", $feed) > 0) { @@ -1321,7 +1321,6 @@ <title>Tiny Tiny RSS : Help</title> <link rel=\"stylesheet\" href=\"tt-rss.css\" type=\"text/css\"> <script type=\"text/javascript\" src=\"functions.js\"></script> - <script type=\"text/javascript\" src=\"feedlist.js\"></script> <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"> </head><body>"; diff --git a/feedlist.js b/feedlist.js index 9e18489d9..ef0c42c2f 100644 --- a/feedlist.js +++ b/feedlist.js @@ -88,8 +88,27 @@ function viewfeed(feed, skip, subop, doc) { } -function init() { +function localHotkeyHandler(keycode) { - hideOrShowFeeds(document, getCookie("ttrss_vf_hreadf") == 1); + if (keycode == 65) { // a + return parent.toggleDispRead(); + } + if (keycode == 85) { // u + if (parent.getActiveFeedId()) { + return viewfeed(parent.getActiveFeedId(), 0, "ForceUpdate"); + } + } + + if (keycode == 82) { // r + return parent.scheduleFeedUpdate(true); + } + +// alert("KC: " + keycode); + +} + +function init() { + hideOrShowFeeds(document, getCookie("ttrss_vf_hreadf") == 1); + document.onkeydown = hotkey_handler; } @@ -264,12 +264,18 @@ function localHotkeyHandler(keycode) { return moveToPost('prev'); } */ - if (keycode == 82) { + if (keycode == 82) { // r return scheduleFeedUpdate(true); } - if (keycode == 85) { - return viewfeed(getActiveFeedId(), 0, "ForceUpdate"); + if (keycode == 85) { // u + if (getActiveFeedId()) { + return viewfeed(getActiveFeedId(), 0, "ForceUpdate"); + } + } + + if (keycode == 65) { // a + return toggleDispRead(); } // notify("KC: " + keycode); diff --git a/viewfeed.js b/viewfeed.js index 73ef4c973..459434839 100644 --- a/viewfeed.js +++ b/viewfeed.js @@ -177,14 +177,28 @@ function viewfeed(id) { function localHotkeyHandler(keycode) { - if (keycode == 78) { + if (keycode == 78) { // n return moveToPost('next'); } - if (keycode == 80) { + if (keycode == 80) { // p return moveToPost('prev'); } + if (keycode == 65) { // a + return parent.toggleDispRead(); + } + + if (keycode == 85) { // u + if (parent.getActiveFeedId()) { + return parent.viewfeed(parent.getActiveFeedId(), 0, "ForceUpdate"); + } + } + + if (keycode == 82) { // r + return parent.scheduleFeedUpdate(true); + } + // FIXME // if (keycode == 85) { // return viewfeed(active_feed_id, active_offset, "ForceUpdate"); @@ -193,3 +207,7 @@ function localHotkeyHandler(keycode) { // alert("KC: " + keycode); } + +function init() { + document.onkeydown = hotkey_handler; +} |