From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Thu, 11 Nov 2010 22:00:51 +0000 (+0300)
Subject: make forced counter update not count as scheduled one
X-Git-Tag: 1.5.0~266
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=47fb32b06d29827f87fb06f51cc1bf5e21688187;p=tt-rss.git

make forced counter update not count as scheduled one
---

diff --git a/functions.js b/functions.js
index 6da8dc80..e1f7d1e1 100644
--- a/functions.js
+++ b/functions.js
@@ -469,6 +469,10 @@ function parse_counters(reply, scheduled_call) {
 
 			if (feedctr && feedu && feedr) {
 
+//				if (id == getActiveFeedId())
+//					console.log("HAS CTR: " + feedu.innerHTML + " GOT CTR: " + ctr + 
+//							" IS_SCHED: " + scheduled_call);
+
 				if (parseInt(ctr) > 0 && 
 						parseInt(feedu.innerHTML) < parseInt(ctr) && 
 						id == getActiveFeedId() && scheduled_call) {
diff --git a/tt-rss.js b/tt-rss.js
index 4226fd8d..b09f880d 100644
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -203,11 +203,11 @@ function timeout() {
 			new Ajax.Request("backend.php", {
 				parameters: query_str,
 				onComplete: function(transport) { 
-						handle_rpc_reply(transport, true);
+						handle_rpc_reply(transport, !_force_scheduled_update);
+						_force_scheduled_update = false;
 					} });
 
 			last_scheduled_update = ts;
-			_force_scheduled_update = false;
 		}
 
 	} catch (e) {
@@ -1291,6 +1291,7 @@ function handle_rpc_reply(transport, scheduled_call) {
 				message = message.firstChild.nodeValue;
 
 				if (message == "UPDATE_COUNTERS") {
+					console.log("need to refresh counters...");
 					setInitParam("last_article_id", -1);
 					_force_scheduled_update = true;
 				}