From: Andrew Dolgov Date: Thu, 13 Sep 2012 22:40:01 +0000 (+0400) Subject: FeedTree: fix subcategory entries not hidden properly X-Git-Tag: 1.6.0~45 X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=5712a2fe4b13cb9cd32f149ea17a70bdf0bfb086;p=tt-rss.git FeedTree: fix subcategory entries not hidden properly --- diff --git a/js/FeedTree.js b/js/FeedTree.js index de1329bb..fb744bf9 100644 --- a/js/FeedTree.js +++ b/js/FeedTree.js @@ -245,13 +245,17 @@ dojo.declare("fox.FeedTree", dijit.Tree, { hasCats: function() { return this.model.hasCats(); }, - hideRead: function (hide, show_special) { + hideReadCat: function (cat, hide, show_special) { if (this.hasCats()) { - var tree = this; - var cats = this.model.store._arrayOfTopLevelItems; - cats.each(function(cat) { + if (cat && cat.items) { + cat.items.each(function(child) { + if (child.items) { + tree.hideReadCat(child, hide, show_special); + } + }); + var cat_unread = tree.hideReadFeeds(cat.items, hide, show_special); var id = String(cat.id); @@ -270,6 +274,17 @@ dojo.declare("fox.FeedTree", dijit.Tree, { ++cat_unread; } } + } + } + }, + hideRead: function (hide, show_special) { + if (this.hasCats()) { + + var tree = this; + var cats = this.model.store._arrayOfTopLevelItems; + + cats.each(function(cat) { + tree.hideReadCat(cat, hide, show_special); }); } else {