From: Andrew Dolgov <fox@bah.spb.su>
Date: Sat, 17 Jan 2009 09:48:25 +0000 (+0100)
Subject: move r and q hotkeys to prefix f
X-Git-Tag: 1.3.0~129
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=617698d71010d43161b968811f50e0edce25dc1a;p=tt-rss.git

move r and q hotkeys to prefix f
---

diff --git a/tt-rss.js b/tt-rss.js
index 3cb07e12..658c696d 100644
--- 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;