From: Andrew Dolgov <fox@bah.spb.su>
Date: Tue, 3 Jun 2008 15:43:25 +0000 (+0100)
Subject: remove toggling from = hotkey, rename to f h
X-Git-Tag: 1.2.24~12
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=004523dda5b91a641b278498fc6172c06ec428b9;p=tt-rss.git

remove toggling from = hotkey, rename to f h
---

diff --git a/feedlist.js b/feedlist.js
index 6ac2765d..1cd78452 100644
--- 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 701214ad..d24403cb 100644
--- 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 a9a3b3f1..a8dd16e8 100644
--- 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 05639dbc..f8cd3f0c 100644
--- 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]);