remove previous counter hacks; force request counters when there's no

unread stuff left in current feed (e.g. finished reading)

3 files changed, 5 insertions, 5 deletions

diff --git a/classes/rpc.php b/classes/rpc.php
index 18df21b16..46c8b0d85 100644
--- a/classes/rpc.php
+++ b/classes/rpc.php
@@ -247,8 +247,6 @@ class RPC extends Handler_Protected {
 
 		if ($last_article_id != getLastArticleId($this->link)) {
 			$reply['counters'] = getAllCounters($this->link);
-		} else {
-			$reply['counters'] = getVirtCounters($this->link);
 		}
 
 		$reply['runtime-info'] = make_runtime_info($this->link);
diff --git a/js/feedlist.js b/js/feedlist.js
index a9ee19c06..b2aadab62 100644
--- a/js/feedlist.js
+++ b/js/feedlist.js
@@ -234,7 +234,7 @@ function request_counters(force) {
 
 			var query = "?op=rpc&method=getAllCounters&seq=" + next_seq();
 
-			if (!force && Math.random() >= 0.5)
+			if (!force)
 				query = query + "&last_article_id=" + getInitParam("last_article_id");
 
 			console.log(query);
diff --git a/js/viewfeed.js b/js/viewfeed.js
index 1cdfdba3f..2f1ba24e0 100644
--- a/js/viewfeed.js
+++ b/js/viewfeed.js
@@ -325,7 +325,8 @@ function article_callback2(transport, id) {
 			Element.show(dijit.byId("net-alert").domNode);
 		}
 
-		request_counters();
+		var unread_in_buffer = $$("#headlines-frame > div[id*=RROW][class*=Unread]").length
+		request_counters(unread_in_buffer == 0);
 
 		headlines_scroll_handler($("headlines-frame"));
 
@@ -1550,7 +1551,8 @@ function cdmClicked(event, id) {
 			openArticleInNewWindow(id);
 		}
 
-		request_counters();
+		var unread_in_buffer = $$("#headlines-frame > div[id*=RROW][class*=Unread]").length
+		request_counters(unread_in_buffer == 0);
 
 	} catch (e) {
 		exception_error("cdmClicked");