change hotkeys r and f u to R and r

diff --git a/help/3.php b/help/3.php
index c7a321b9db91503dbcfa6316db7852ca9422a613..32004056870ddb1ec5de9f86a0112e8a47d0aab0 100644 (file)
--- 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 65ed07edb4a6bf43da93433699cfd6a6d5c3a7a4..c8604584091f8726a50ce7ad96a45a04eab71f91 100644 (file)
--- 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');