diff --git a/feedlist.js b/feedlist.js index d61ebfc23..48369089f 100644 --- a/feedlist.js +++ b/feedlist.js @@ -1019,9 +1019,7 @@ function update_feedlist_counters() { hideOrShowFeeds(getInitParam("hide_read_feeds") == 1); - var unread = get_local_feed_unread(-4); - - global_unread = unread; + global_unread = get_local_feed_unread(-4); updateTitle(); } catch (e) { diff --git a/modules/backend-rpc.php b/modules/backend-rpc.php index 967e97aea..3042703ca 100644 --- a/modules/backend-rpc.php +++ b/modules/backend-rpc.php @@ -521,7 +521,7 @@ //$unread_only = db_escape_string($_REQUEST["unread_only"]); //if (!$amount) $amount = 50; - $amount = 100; + $amount = 200; $unread_only = true; print ""; @@ -583,7 +583,6 @@ $line["unread"] = (int)sql_bool_to_bool($line["unread"]); $line["tags"] = format_tags_string(get_article_tags($link, $id), $id); - print json_encode($line); print "]]>"; } diff --git a/tt-rss.js b/tt-rss.js index b4f2d2adb..0182e8e5b 100644 --- a/tt-rss.js +++ b/tt-rss.js @@ -242,6 +242,8 @@ function updateFeedList(silent, fetch) { debug("updateFeedList"); + if (offline_mode) return render_offline_feedlist(); + var query_str = "backend.php?op=feeds"; if (display_tags) { @@ -1582,7 +1584,7 @@ function offline_download_parse(stage, transport) { [id, title, has_icon]); } - window.setTimeout("update_offline_data("+(stage+1)+")", 50); + window.setTimeout("update_offline_data("+(stage+1)+")", 30*1000); } else { var articles = transport.responseXML.getElementsByTagName("article"); @@ -1609,10 +1611,9 @@ function offline_download_parse(stage, transport) { } if (articles_found > 0) { - window.setTimeout("update_offline_data("+(stage+1)+")", 50); + window.setTimeout("update_offline_data("+(stage+1)+")", 60*1000); } else { -// notify_info("All done."); -// closeInfoBox(); + window.setTimeout("update_offline_data(0)", 1800*1000); } } @@ -1647,6 +1648,7 @@ function update_offline_data(stage) { new Ajax.Request(query, { onComplete: function(transport) { offline_download_parse(stage, transport); + debug("update_offline_data: done " + stage); } }); } catch (e) {