From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Sat, 15 Sep 2012 16:44:50 +0000 (+0400)
Subject: cleanup previous patch
X-Git-Tag: 1.6.0~32
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=1a8a623924a441923933cc9cbccc8f836df7e8a9;p=tt-rss.git

cleanup previous patch
---

diff --git a/js/FeedTree.js b/js/FeedTree.js
index 6e304360..5b5f8955 100644
--- a/js/FeedTree.js
+++ b/js/FeedTree.js
@@ -250,12 +250,6 @@ dojo.declare("fox.FeedTree", dijit.Tree, {
 			var tree = this;
 
 			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);
@@ -299,7 +293,14 @@ dojo.declare("fox.FeedTree", dijit.Tree, {
 		items.each(function(feed) {
 			var id = String(feed.id);
 
-			if (!id.match("^CAT:")) {
+			// it's a subcategory
+			if (feed.items) {
+				feed.items.each(function(child) {
+					if (child.items) {
+						tree.hideReadCat(child, hide, show_special);
+					}
+				});
+			} else {	// it's a feed
 				var bare_id = parseInt(feed.bare_id);;
 
 				var unread = feed.unread[0];