From 3bdb368b87fd4351949919c2c95cc565ce3406de Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 21 Dec 2005 08:12:17 +0100 Subject: [PATCH] pass object to call updateTitle() to parse_counters() (closes #9) --- functions.js | 11 +++++++---- tt-rss.js | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/functions.js b/functions.js index 989a144bd..01f1a1448 100644 --- a/functions.js +++ b/functions.js @@ -355,7 +355,7 @@ if (!xmlhttp_rpc && typeof XMLHttpRequest!='undefined') { xmlhttp_rpc = new XMLHttpRequest(); } -function parse_counters(reply, f_document) { +function parse_counters(reply, f_document, title_obj) { try { for (var l = 0; l < reply.childNodes.length; l++) { var id = reply.childNodes[l].getAttribute("id"); @@ -365,8 +365,8 @@ function parse_counters(reply, f_document) { var has_img = reply.childNodes[l].getAttribute("hi"); if (id == "global-unread") { - parent.global_unread = ctr; - parent.updateTitle(); + title_obj.global_unread = ctr; + title_obj.updateTitle(); continue; } @@ -419,6 +419,9 @@ function parse_counters(reply, f_document) { } } +// this one is called from feedlist context +// thus title_obj passed to parse_counters is parent (e.g. main ttrss window) + function all_counters_callback() { if (xmlhttp_rpc.readyState == 4) { try { @@ -430,7 +433,7 @@ function all_counters_callback() { var reply = xmlhttp_rpc.responseXML.firstChild; var f_document = parent.frames["feeds-frame"].document; - parse_counters(reply, f_document); + parse_counters(reply, f_document, parent); } catch (e) { exception_error("all_counters_callback", e); diff --git a/tt-rss.js b/tt-rss.js index 638f066de..c66d57ce7 100644 --- a/tt-rss.js +++ b/tt-rss.js @@ -96,7 +96,7 @@ function refetch_callback() { var f_document = window.frames["feeds-frame"].document; - parse_counters(reply, f_document); + parse_counters(reply, f_document, window); updateTitle(""); notify("All feeds updated.");