From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Thu, 11 Nov 2010 08:36:56 +0000 (+0300)
Subject: fix _force_scheduled_update handling
X-Git-Tag: 1.5.0~295
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=ac49453bd8af68270eb6e5c0564394e3e8b1b0a8;p=tt-rss.git

fix _force_scheduled_update handling
---

diff --git a/tt-rss.js b/tt-rss.js
index 44c0b608..841d4b33 100644
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -163,6 +163,8 @@ function timeout() {
 
 		if (ts - last_scheduled_update > 10 || _force_scheduled_update) {
 
+			//console.log("timeout()");
+
 			window.clearTimeout(counter_timeout_id);
 		
 			var query_str = "?op=rpc&subop=getAllCounters";
@@ -181,7 +183,9 @@ function timeout() {
 			}
 			
 			query_str = query_str + "&omode=" + omode;
-			query_str = query_str + "&last_article_id=" + getInitParam("last_article_id");
+
+			if (!_force_scheduled_update)
+				query_str = query_str + "&last_article_id=" + getInitParam("last_article_id");
 		
 			//console.log("[timeout]" + query_str);
 		
@@ -192,6 +196,7 @@ function timeout() {
 					} });
 
 			last_scheduled_update = ts;
+			_force_scheduled_update = false;
 		}
 
 	} catch (e) {
diff --git a/viewfeed.js b/viewfeed.js
index f46b9786..4dacb200 100644
--- a/viewfeed.js
+++ b/viewfeed.js
@@ -323,6 +323,9 @@ function showArticleInHeadlines(id) {
 
 		markHeadline(id);
 
+		if (article_is_unread)
+			_force_scheduled_update = true;
+
 	} catch (e) {
 		exception_error("showArticleInHeadlines", e);
 	}