diff options
| -rw-r--r-- | backend.php | 2 | ||||
| -rw-r--r-- | tt-rss.js | 18 |
2 files changed, 12 insertions, 8 deletions
diff --git a/backend.php b/backend.php index fc91ed153..71dc030cb 100644 --- a/backend.php +++ b/backend.php @@ -103,7 +103,7 @@ print "<p align=\"center\">All feeds: <a class=\"button\" - href=\"javascript:scheduleFeedUpdate()\">Update</a>"; + href=\"javascript:scheduleFeedUpdate(true)\">Update</a>"; print " <a class=\"button\" href=\"javascript:catchupAllFeeds()\">Mark as read</a></p>"; @@ -54,7 +54,7 @@ function feedlist_callback() { } if (first_run) { - scheduleFeedUpdate(); + scheduleFeedUpdate(false); first_run = false; } else { notify(""); @@ -103,17 +103,21 @@ function view_callback() { function refetch_callback() { if (xmlhttp_rpc.readyState == 4) { - // feeds are updated in background - updateFeedList(false, false); -// notify("All feeds updated"); + updateFeedList(true, false); } } -function scheduleFeedUpdate() { +function scheduleFeedUpdate(force) { notify("Updating feeds in background..."); - var query_str = "backend.php?op=rpc&subop=forceUpdateAllFeeds"; + var query_str = "backend.php?op=rpc&subop="; + + if (force) { + query_str = query_str = "forceUpdateAllFeeds"; + } else { + query_str = query_str = "updateAllFeeds"; + } if (xmlhttp_rpc.readyState == 4 || xmlhttp_rpc.readyState == 0) { xmlhttp_rpc.open("GET", query_str, true); @@ -259,7 +263,7 @@ function view(id,feed_id) { function timeout() { - scheduleFeedUpdate(); + scheduleFeedUpdate(true); setTimeout("timeout()", 1800*1000); |