consolidate counter parsing code
This commit is contained in:
parent
c3d74dca93
commit
1a6a9555ff
2 changed files with 58 additions and 77 deletions
30
functions.js
30
functions.js
|
@ -344,18 +344,8 @@ if (!xmlhttp_rpc && typeof XMLHttpRequest!='undefined') {
|
|||
xmlhttp_rpc = new XMLHttpRequest();
|
||||
}
|
||||
|
||||
function all_counters_callback() {
|
||||
if (xmlhttp_rpc.readyState == 4) {
|
||||
function parse_counters(reply, f_document) {
|
||||
try {
|
||||
if (!xmlhttp_rpc.responseXML || !xmlhttp_rpc.responseXML.firstChild) {
|
||||
notify("[all_counters_callback] backend did not return valid XML");
|
||||
return;
|
||||
}
|
||||
|
||||
var reply = xmlhttp_rpc.responseXML.firstChild;
|
||||
|
||||
var f_document = parent.frames["feeds-frame"].document;
|
||||
|
||||
for (var l = 0; l < reply.childNodes.length; l++) {
|
||||
var id = reply.childNodes[l].getAttribute("id");
|
||||
var t = reply.childNodes[l].getAttribute("type");
|
||||
|
@ -404,6 +394,24 @@ function all_counters_callback() {
|
|||
}
|
||||
}
|
||||
}
|
||||
} catch (e) {
|
||||
exception_error(e);
|
||||
}
|
||||
}
|
||||
|
||||
function all_counters_callback() {
|
||||
if (xmlhttp_rpc.readyState == 4) {
|
||||
try {
|
||||
if (!xmlhttp_rpc.responseXML || !xmlhttp_rpc.responseXML.firstChild) {
|
||||
notify("[all_counters_callback] backend did not return valid XML");
|
||||
return;
|
||||
}
|
||||
|
||||
var reply = xmlhttp_rpc.responseXML.firstChild;
|
||||
var f_document = parent.frames["feeds-frame"].document;
|
||||
|
||||
parse_counters(reply, f_document);
|
||||
|
||||
} catch (e) {
|
||||
exception_error("all_counters_callback", e);
|
||||
}
|
||||
|
|
29
tt-rss.js
29
tt-rss.js
|
@ -93,34 +93,7 @@ function refetch_callback() {
|
|||
|
||||
var f_document = window.frames["feeds-frame"].document;
|
||||
|
||||
for (var l = 0; l < reply.childNodes.length; l++) {
|
||||
var id = reply.childNodes[l].getAttribute("id");
|
||||
var ctr = reply.childNodes[l].getAttribute("counter");
|
||||
|
||||
var feedctr = f_document.getElementById("FEEDCTR-" + id);
|
||||
var feedu = f_document.getElementById("FEEDU-" + id);
|
||||
var feedr = f_document.getElementById("FEEDR-" + id);
|
||||
|
||||
if (id == "global-unread") {
|
||||
global_unread = ctr;
|
||||
continue;
|
||||
}
|
||||
|
||||
if (feedctr && feedu && feedr) {
|
||||
|
||||
feedu.innerHTML = ctr;
|
||||
|
||||
if (ctr > 0) {
|
||||
feedctr.className = "odd";
|
||||
if (!feedr.className.match("Unread")) {
|
||||
feedr.className = feedr.className + "Unread";
|
||||
}
|
||||
} else {
|
||||
feedctr.className = "invisible";
|
||||
feedr.className = feedr.className.replace("Unread", "");
|
||||
}
|
||||
}
|
||||
}
|
||||
parse_counters(reply, f_document);
|
||||
|
||||
updateTitle("");
|
||||
notify("All feeds updated.");
|
||||
|
|
Loading…
Reference in a new issue