From: Andrew Dolgov <fox@bah.spb.su>
Date: Sat, 17 May 2008 15:00:48 +0000 (+0100)
Subject: change hotkeys r and f u to R and r
X-Git-Tag: 1.2.23-final~86
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=c239b26b3a199a92ee64ee58cff118283fa9495e;p=tt-rss.git

change hotkeys r and f u to R and r
---

diff --git a/help/3.php b/help/3.php
index c7a321b9..32004056 100644
--- a/help/3.php
+++ b/help/3.php
@@ -33,10 +33,10 @@
 	<h2><?php echo __("Feed actions") ?></h2>
 
 	<table>
+		<tr><td class='n'>r</td><td><?php echo __("Update active feed") ?></td></tr>
+		<tr><td class='n'>R</td><td><?php echo __("Update all feeds") ?></td></tr>
 		<tr><td class='n'>f a</td><td><?php echo __("(Un)hide read feeds") ?></td></tr>
 		<tr><td class='n'>f s</td><td><?php echo __("Subscribe to feed") ?></td></tr>
-		<tr><td class='n'>f u</td><td><?php echo __("Update feed") ?></td></tr>
-		<tr><td class='n'>f U</td><td><?php echo __("Update all feeds") ?></td></tr>
 		<tr><td class='n'>f e</td><td><?php echo __("Edit feed") ?></td></tr>
 		<tr><td class='n'>f c</td><td><?php echo __("Mark feed as read") ?></td></tr>
 		<tr><td class='n'>f C</td><td><?php echo __("Mark all feeds as read") ?></td></tr>
diff --git a/tt-rss.js b/tt-rss.js
index 65ed07ed..c8604584 100644
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -986,10 +986,16 @@ function hotkey_handler(e) {
 				return displayDlg("search", getActiveFeedId() + ":" + activeFeedIsCat());
 			}
 
-			if (keycode == 82) { // r
+			if (keycode == 82 && shift_key) { // R
 				return scheduleFeedUpdate(true);
 			}
 
+			if (keycode == 82) { // r
+				if (getActiveFeedId()) {
+					return viewfeed(getActiveFeedId(), "ForceUpdate");
+				}
+			}
+
 			if (keycode == 74) { // j
 				var feed = getActiveFeedId();
 				var new_feed = getRelativeFeedId(feedlist, feed, 'prev');