rework auto-refresh method if number of subscriptions changed

This commit is contained in:
Andrew Dolgov 2006-08-13 10:45:30 +01:00
parent aec3ce39de
commit 7bf7e4d3ef
2 changed files with 19 additions and 9 deletions

View file

@ -490,15 +490,16 @@ function parse_counters(reply, scheduled_call) {
var has_img = reply.childNodes[l].getAttribute("hi"); var has_img = reply.childNodes[l].getAttribute("hi");
var updated = reply.childNodes[l].getAttribute("updated"); var updated = reply.childNodes[l].getAttribute("updated");
if (t == "feed") {
feeds_found++;
}
if (id == "global-unread") { if (id == "global-unread") {
title_obj.global_unread = ctr; title_obj.global_unread = ctr;
title_obj.updateTitle(); title_obj.updateTitle();
continue; continue;
} }
if (id == "subscribed-feeds") {
feeds_found = ctr;
continue;
}
if (t == "category") { if (t == "category") {
var catctr = f_document.getElementById("FCATCTR-" + id); var catctr = f_document.getElementById("FCATCTR-" + id);
@ -573,10 +574,9 @@ function parse_counters(reply, scheduled_call) {
debug("Feed counters, C: " + feeds_found + ", S:" + feeds_stored); debug("Feed counters, C: " + feeds_found + ", S:" + feeds_stored);
if (feeds_stored != feeds_found) { if (feeds_stored != feeds_found) {
if (feeds_found != 0) { getMainContext().number_of_feeds = feeds_found;
getMainContext().number_of_feeds = feeds_found;
} if (feeds_stored != 0) {
if (feeds_stored != 0 && feeds_found != 0) {
debug("Subscribed feed number changed, refreshing feedlist"); debug("Subscribed feed number changed, refreshing feedlist");
updateFeedList(); updateFeedList();
} }

View file

@ -1562,7 +1562,17 @@
if ($global_unread == -1) { if ($global_unread == -1) {
$global_unread = getGlobalUnread($link); $global_unread = getGlobalUnread($link);
} }
print "<counter type=\"global\" id='global-unread' counter='$global_unread'/>"; print "<counter type=\"global\" id='global-unread'
counter='$global_unread'/>";
$result = db_query($link, "SELECT COUNT(id) AS fn FROM
ttrss_feeds WHERE owner_uid = " . $_SESSION["uid"]);
$subscribed_feeds = db_fetch_result($result, 0, "fn");
print "<counter type=\"global\" id='subscribed-feeds'
counter='$subscribed_feeds'/>";
} }
function getTagCounters($link, $smart_mode = SMART_RPC_COUNTERS) { function getTagCounters($link, $smart_mode = SMART_RPC_COUNTERS) {