diff options
author | Andrew Dolgov <[email protected]> | 2012-10-11 12:46:33 +0400 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2012-10-11 12:46:33 +0400 |
commit | 0ef32f48b26f94b041977730bf00fe2750e4ad25 (patch) | |
tree | 037ae9142b7d42a5f7db5019d0aa1ef546b9a1bc /js/feedlist.js | |
parent | daf0b0142dc264d784c5859ef6f370d9b3b21f13 (diff) |
unify child category counter display; remove include_children control
Diffstat (limited to 'js/feedlist.js')
-rw-r--r-- | js/feedlist.js | 32 |
1 files changed, 1 insertions, 31 deletions
diff --git a/js/feedlist.js b/js/feedlist.js index 972fa3b1e..b7cd57c5c 100644 --- a/js/feedlist.js +++ b/js/feedlist.js @@ -179,7 +179,6 @@ function viewfeed(feed, method, is_cat, offset, background, infscroll_req) { } query += "&cat=" + is_cat; - query += "&include_children=" + dijit.byId("include_children").attr("checked"); console.log(query); @@ -296,7 +295,6 @@ function parse_counters(elems, scheduled_call) { var error = elems[l].error; var has_img = elems[l].has_img; var updated = elems[l].updated; - var child_unread = parseInt(elems[l].child_counter); if (id == "global-unread") { global_unread = ctr; @@ -317,7 +315,7 @@ function parse_counters(elems, scheduled_call) { } if (getFeedUnread(id, (kind == "cat")) != ctr || - (kind == "cat" && getCatParam(id) != child_unread)) { + (kind == "cat")) { cache_delete("feed:" + id + ":" + (kind == "cat")); } @@ -336,8 +334,6 @@ function parse_counters(elems, scheduled_call) { setFeedIcon(id, false, 'images/blank_icon.gif'); } } - } else { - setCatParam(id, child_unread); } } @@ -427,27 +423,6 @@ function setFeedValue(feed, is_cat, key, value) { } } -function setCatParam(cat, value) { - try { - var tree = dijit.byId("feedTree"); - - if (tree && tree.model) - return tree.setCatParam(cat, value); - - } catch (e) { - // - } -} - -function getCatParam(cat) { - try { - return getFeedValue(cat, true, "child_unread"); - } catch (e) { - // - } -} - - function selectFeed(feed, is_cat) { try { var tree = dijit.byId("feedTree"); @@ -581,11 +556,6 @@ function catchupFeed(feed, is_cat) { function decrementFeedCounter(feed, is_cat) { try { - // we have subcats, no way to figure out if this article is - // actually from this category - if (is_cat && getCatParam(feed) > 0) - return; - var ctr = getFeedUnread(feed, is_cat); if (ctr > 0) { |