mirror of
https://git.tt-rss.org/git/tt-rss.git
synced 2025-12-16 03:16:01 +00:00
make forced counter update not count as scheduled one
This commit is contained in:
@@ -469,6 +469,10 @@ function parse_counters(reply, scheduled_call) {
|
|||||||
|
|
||||||
if (feedctr && feedu && feedr) {
|
if (feedctr && feedu && feedr) {
|
||||||
|
|
||||||
|
// if (id == getActiveFeedId())
|
||||||
|
// console.log("HAS CTR: " + feedu.innerHTML + " GOT CTR: " + ctr +
|
||||||
|
// " IS_SCHED: " + scheduled_call);
|
||||||
|
|
||||||
if (parseInt(ctr) > 0 &&
|
if (parseInt(ctr) > 0 &&
|
||||||
parseInt(feedu.innerHTML) < parseInt(ctr) &&
|
parseInt(feedu.innerHTML) < parseInt(ctr) &&
|
||||||
id == getActiveFeedId() && scheduled_call) {
|
id == getActiveFeedId() && scheduled_call) {
|
||||||
|
|||||||
@@ -203,11 +203,11 @@ function timeout() {
|
|||||||
new Ajax.Request("backend.php", {
|
new Ajax.Request("backend.php", {
|
||||||
parameters: query_str,
|
parameters: query_str,
|
||||||
onComplete: function(transport) {
|
onComplete: function(transport) {
|
||||||
handle_rpc_reply(transport, true);
|
handle_rpc_reply(transport, !_force_scheduled_update);
|
||||||
|
_force_scheduled_update = false;
|
||||||
} });
|
} });
|
||||||
|
|
||||||
last_scheduled_update = ts;
|
last_scheduled_update = ts;
|
||||||
_force_scheduled_update = false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
@@ -1291,6 +1291,7 @@ function handle_rpc_reply(transport, scheduled_call) {
|
|||||||
message = message.firstChild.nodeValue;
|
message = message.firstChild.nodeValue;
|
||||||
|
|
||||||
if (message == "UPDATE_COUNTERS") {
|
if (message == "UPDATE_COUNTERS") {
|
||||||
|
console.log("need to refresh counters...");
|
||||||
setInitParam("last_article_id", -1);
|
setInitParam("last_article_id", -1);
|
||||||
_force_scheduled_update = true;
|
_force_scheduled_update = true;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user