remove toggling from = hotkey, rename to f h

diff --git a/feedlist.js b/feedlist.js
index 6ac2765d1452154f140cc7dfa7668a3ccad1f8ef..1cd784524a0ab8b833ed31c5da31ea752c609014 100644 (file)
--- a/feedlist.js
+++ b/feedlist.js
@@ -44,9 +44,6 @@ function viewNextFeedPage() {
 function viewfeed(feed, subop, is_cat, subop_param, skip_history, offset) {
        try {
 
-               // reset = hotkey
-               read_headlines_visible = true;
-
 //             if (!offset) page_offset = 0;
 
                last_requested_article = 0;

diff --git a/help/3.php b/help/3.php
index 701214adadf79468d2a78c5226b21c51fc32ffc2..d24403cbca193e9abd2c40211f6b1130152331ef 100644 (file)
--- a/help/3.php
+++ b/help/3.php
@@ -38,11 +38,11 @@
        <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'>=</td><td><?php echo __("(Un)hide read articles") ?></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 e</td><td><?php echo __("Edit feed") ?></td></tr>
                <tr><td class='n'>f w</td><td><?php echo __("Sort by name or unread count") ?></td></tr>
+               <tr><td class='n'>f h</td><td><?php echo __("Hide visible read articles") ?></td></tr>
                <tr><td class='n'>q</td><td><?php echo __("Mark feed as read") ?></td></tr>
                <tr><td class='n'>Q</td><td><?php echo __("Mark all feeds as read") ?></td></tr>
        </table>

diff --git a/tt-rss.js b/tt-rss.js
index a9a3b3f1b43fe9d92c02f162e96cd6b0c64e6cdd..a8dd16e88457b81152360afb38b18056cd8f6ce9 100644 (file)
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -1170,11 +1170,6 @@ function hotkey_handler(e) {
                                        }
                                }
                        }
-
-                       if (keycode == 187) { // =
-                               hideReadHeadlines();
-                               return;
-                       }
                }
 
                /* Prefix f */
@@ -1229,6 +1224,11 @@ function hotkey_handler(e) {
                                return resort_feedlist();
                        }
 
+                       if (keycode == 72) { // h
+                               hideReadHeadlines();
+                               return;
+                       }
+
                }
 
                /* Prefix c */

diff --git a/viewfeed.js b/viewfeed.js
index 05639dbc32ca6833583dc7bd35fc0e4da331ef1c..f8cd3f0c333e3b20aad6ff2f06f71d15352ef059 100644 (file)
--- a/viewfeed.js
+++ b/viewfeed.js
@@ -21,7 +21,6 @@ var vgroup_last_feed = false;
 var post_under_pointer = false;
 
 var last_requested_article = false;
-var read_headlines_visible = true;
 
 function catchup_callback() {
        if (xmlhttp_rpc.readyState == 4) {
@@ -1805,6 +1804,8 @@ function hideReadHeadlines() {
                        ids = cdmGetVisibleArticles();
                }
 
+               var read_headlines_visible = true;
+
                for (var i = 0; i < ids.length; i++) {
                        var row = document.getElementById("RROW-" + ids[i]);