From: Andrew Dolgov <fox@madoka.spb.ru>
Date: Wed, 7 Sep 2005 07:47:10 +0000 (+0100)
Subject: fix updating of unread counters in feedlist on headlines load
X-Git-Tag: 1.0.3~16
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=0c6744067065db59aee2e6da2260dc6e591b52d6;p=tt-rss.git

fix updating of unread counters in feedlist on headlines load
---

diff --git a/backend.php b/backend.php
index 50d316b6..bf8394b0 100644
--- a/backend.php
+++ b/backend.php
@@ -106,10 +106,14 @@
 			}
 			print "<span id=\"FEEDN-$feed_id\">$feed</span>";
 
-			if ($unread > 0) {
-				print "<span id=\"FEEDCTR-$feed_id\">
-					&nbsp;(<span id=\"FEEDU-$feed_id\">$unread</span>)</span>";
+			if ($unread != 0) {
+				$fctr_class = "";
+			} else {
+				$fctr_class = "class=\"invisible\"";
 			}
+
+			print "<span $fctr_class id=\"FEEDCTR-$feed_id\">
+				 (<span id=\"FEEDU-$feed_id\">$unread</span>)</span>";
 			
 			print "</li>";
 
@@ -456,19 +460,24 @@
 			var p_document = parent.frames['feeds-frame'].document;
 
 			var feedr = p_document.getElementById(\"FEEDR-\" + $feed);
-			var feedt = p_document.getElementById(\"FEEDT-\" + $feed);
 			var feedu = p_document.getElementById(\"FEEDU-\" + $feed);
 
-			feedt.innerHTML = \"$total\";
-			feedu.innerHTML = \"$unread\";
+			if (feedu) {
+				feedu.innerHTML = \"$unread\";
+			}
+
+			var feedctr = p_document.getElementById(\"FEEDCTR-\" + $feed);
 
 			if ($unread > 0 && !feedr.className.match(\"Unread\")) {
 					feedr.className = feedr.className + \"Unread\";
+					feedctr.className = '';
 			} else if ($unread <= 0) {	
 					feedr.className = feedr.className.replace(\"Unread\", \"\");
+					feedctr.className = 'invisible';
 			}	
 
-			//p_notify('');
+			p_notify(\"\");
+
 		</script>";
 
 		if ($addheader) {
diff --git a/tt-rss.css b/tt-rss.css
index 40d959d7..f3113b1b 100644
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -128,7 +128,8 @@ ul.feedList li {
 }
 
 ul.feedList li.oddSelected, ul.feedList li.evenSelected,
-	li.oddUnreadSelected, li.evenUnreadSelected {
+	li.oddUnreadSelected, li.evenUnreadSelected, li.evenSelectedUnread,
+	li.oddSelectedUnread {
 	background-color : white;
 } 
 
diff --git a/viewfeed.js b/viewfeed.js
index 85963dfe..1fade859 100644
--- a/viewfeed.js
+++ b/viewfeed.js
@@ -25,7 +25,7 @@ if (!xmlhttp_rpc && typeof XMLHttpRequest!='undefined') {
 
 function view(id, feed_id) {
 
-//	p_notify("Loading article...");
+	p_notify("Loading article...");
 
 	enableHotkeys();
 
@@ -46,7 +46,7 @@ function view(id, feed_id) {
 			var feedctr = f_doc.getElementById("FEEDCTR-" + feed_id);
 
 			if (feedctr) {
-				feedctr.innerHTML = "";
+				feedctr.className = "invisible";
 			}
 		}