move r and q hotkeys to prefix f

diff --git a/tt-rss.js b/tt-rss.js
index 3cb07e1243ba18c0bc0879c80c6ca492a4dfd5fc..658c696d2fc2282917987ad4e4ec56f41439e5b7 100644 (file)
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -1095,13 +1095,6 @@ function hotkey_handler(e) {
                                return;
                        }
 
-                       if (keycode == 82) { // r
-                               if (getActiveFeedId()) {
-                                       viewfeed(getActiveFeedId(), "ForceUpdate", activeFeedIsCat());
-                                       return;
-                               }
-                       }
-
                        if (keycode == 74) { // j
                                var feed = getActiveFeedId();
                                var new_feed = getRelativeFeedId2(feed, activeFeedIsCat(), 'prev');
@@ -1229,13 +1222,6 @@ function hotkey_handler(e) {
                                }
                        }
 
-                       if (keycode == 81) { // q
-                               if (getActiveFeedId()) {
-                                       catchupCurrentFeed();
-                                       return;
-                               }
-                       }
-
                        if (keycode == 220 && shift_key) { // shift + |
                                if (document.getElementById("subtoolbar_search")) {
                                        if (Element.visible("subtoolbar_search")) {
@@ -1262,6 +1248,20 @@ function hotkey_handler(e) {
 
                        hotkey_prefix = false;
 
+                       if (keycode == 81) { // q
+                               if (getActiveFeedId()) {
+                                       catchupCurrentFeed();
+                                       return;
+                               }
+                       }
+
+                       if (keycode == 82) { // r
+                               if (getActiveFeedId()) {
+                                       viewfeed(getActiveFeedId(), "ForceUpdate", activeFeedIsCat());
+                                       return;
+                               }
+                       }
+
                        if (keycode == 65) { // a
                                toggleDispRead();
                                return false;