1 files changed, 61 insertions, 9 deletions

diff --git a/js/FeedTree.js b/js/FeedTree.js
index fbddb708f..e35417daf 100644
--- a/js/FeedTree.js
+++ b/js/FeedTree.js
@@ -184,10 +184,60 @@ dojo.declare("fox.FeedTree", dijit.Tree, {
 			tnode._menu = menu;
 		}
 
+		ctr = dojo.doc.createElement('span');
+		ctr.className = 'counterNode';
+		ctr.innerHTML = args.item.unread > 0 ? args.item.unread : args.item.auxcounter;
+
+		//args.item.unread > 0 ? ctr.addClassName("unread") : ctr.removeClassName("unread");
+
+		args.item.unread > 0 || args.item.auxcounter > 0 ? Element.show(ctr) : Element.hide(ctr);
+
+		args.item.unread == 0 && args.item.auxcounter > 0 ? ctr.addClassName("aux") : ctr.removeClassName("aux");
+
+		dojo.place(ctr, tnode.rowNode, 'first');
+		tnode.counterNode = ctr;
 
 		//tnode.labelNode.innerHTML = args.label;
 		return tnode;
 	},
+	postCreate: function() {
+		this.connect(this.model, "onChange", "updateCounter");
+		this.connect(this, "_expandNode", function() {
+			this.hideRead(getInitParam("hide_read_feeds"), getInitParam("hide_read_shows_special"));
+		});
+
+		this.inherited(arguments);
+	},
+	updateCounter: function (item) {
+		var tree = this;
+
+		//console.log("updateCounter: " + item.id[0] + " " + item.unread + " " + tree);
+
+		var node = tree._itemNodesMap[item.id];
+
+		if (node) {
+			node = node[0];
+
+			if (node.counterNode) {
+				ctr = node.counterNode;
+				ctr.innerHTML = item.unread > 0 ? item.unread : item.auxcounter;
+				item.unread > 0 || item.auxcounter > 0 ?
+					Effect.Appear(ctr, {duration : 0.3,
+					queue: { position: 'end', scope: 'CAPPEAR-' + item.id, limit: 1 }}) :
+						Element.hide(ctr);
+
+				item.unread == 0 && item.auxcounter > 0 ? ctr.addClassName("aux") : ctr.removeClassName("aux");
+
+			}
+		}
+
+	},
+	getTooltip: function (item) {
+		if (item.updated)
+			return item.updated;
+		else
+			return "";
+	},
 	getIconClass: function (item, opened) {
 		return (!item || this.model.mayHaveChildren(item)) ? (opened ? "dijitFolderOpened" : "dijitFolderClosed") : "feedIcon";
 	},
@@ -195,8 +245,12 @@ dojo.declare("fox.FeedTree", dijit.Tree, {
 		return (item.unread == 0) ? "dijitTreeLabel" : "dijitTreeLabel Unread";
 	},
 	getRowClass: function (item, opened) {
-		return (!item.error || item.error == '') ? "dijitTreeRow" :
+		var rc = (!item.error || item.error == '') ? "dijitTreeRow" :
 			"dijitTreeRow Error";
+
+		if (item.unread > 0) rc += " Unread";
+
+		return rc;
 	},
 	getLabel: function(item) {
 		var name = String(item.name);
@@ -208,15 +262,15 @@ dojo.declare("fox.FeedTree", dijit.Tree, {
 		name = name.replace(/&lt;/g, "<");
 		name = name.replace(/&gt;/g, ">");
 
-		var label;
+		/* var label;
 
 		if (item.unread > 0) {
 			label = name + " (" + item.unread + ")";
 		} else {
 			label = name;
-		}
+		} */
 
-		return label;
+		return name;
 	},
 	expandParentNodes: function(feed, is_cat, list) {
 		try {
@@ -307,11 +361,9 @@ dojo.declare("fox.FeedTree", dijit.Tree, {
 
 		if (treeNode) {
 			treeNode = treeNode[0];
-			if (is_cat) {
-				if (treeNode.loadingNode) {
-					treeNode.loadingNode.src = src;
-					return true;
-				}
+			if (treeNode.loadingNode) {
+				treeNode.loadingNode.src = src;
+				return true;
 			} else {
 				treeNode.expandoNode.src = src;
 				return true;