summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2010-11-11 11:36:56 +0300
committerAndrew Dolgov <[email protected]>2010-11-11 11:37:10 +0300
commitac49453bd8af68270eb6e5c0564394e3e8b1b0a8 (patch)
treef01ad0e641b8b1d86f5bc80bf27cff035954c03e
parentd36f560740ee03a7a224058578a88182cb0d3a71 (diff)
fix _force_scheduled_update handling
-rw-r--r--tt-rss.js7
-rw-r--r--viewfeed.js3
2 files changed, 9 insertions, 1 deletions
diff --git a/tt-rss.js b/tt-rss.js
index 44c0b608e..841d4b337 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 f46b97863..4dacb2003 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);
}