1 files changed, 122 insertions, 8 deletions

diff --git a/js/FeedTree.js b/js/FeedTree.js
index 2cb6346e4..d80f46062 100644
--- a/js/FeedTree.js
+++ b/js/FeedTree.js
@@ -100,13 +100,13 @@ dojo.declare("fox.FeedTree", dijit.Tree, {
 	_createTreeNode: function(args) {
 		var tnode = new dijit._TreeNode(args);
 
-		if (args.item.icon)
+		if (args.item.icon && args.item.icon[0])
 			tnode.iconNode.src = args.item.icon[0];
 
 		var id = args.item.id[0];
 		var bare_id = parseInt(id.substr(id.indexOf(':')+1));
 
-		if (bare_id < -10) {
+		if (bare_id < _label_base_index) {
 			var span = dojo.doc.createElement('span');
 			var fg_color = args.item.fg_color[0];
 			var bg_color = args.item.bg_color[0];
@@ -162,6 +162,14 @@ dojo.declare("fox.FeedTree", dijit.Tree, {
 			tnode._menu = menu;
 		}
 
+		if (id.match("CAT:")) {
+			loading = dojo.doc.createElement('img');
+			loading.className = 'loadingNode';
+			loading.src = 'images/blank_icon.gif';
+			dojo.place(loading, tnode.labelNode, 'after');
+			tnode.loadingNode = loading;
+		}
+
 		if (id.match("CAT:") && bare_id == -1) {
 			var menu = new dijit.Menu();
 			menu.row_id = bare_id;
@@ -176,10 +184,51 @@ dojo.declare("fox.FeedTree", dijit.Tree, {
 			tnode._menu = menu;
 		}
 
+		ctr = dojo.doc.createElement('span');
+		ctr.className = 'counterNode';
+		ctr.innerHTML = args.item.unread;
+
+		//args.item.unread > 0 ? ctr.addClassName("unread") : ctr.removeClassName("unread");
+
+		args.item.unread > 0 ? Element.show(ctr) : Element.hide(ctr);
+
+		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.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;
+				item.unread > 0 ? Effect.Appear(ctr, {duration : 0.3,
+					queue: { position: 'end', scope: 'CAPPEAR-' + item.id, limit: 1 }}) :
+						Element.hide(ctr);
+			}
+		}
+
+	},
+	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";
 	},
@@ -187,8 +236,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);
@@ -200,17 +253,73 @@ 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 name;
+	},
+	expandParentNodes: function(feed, is_cat, list) {
+		try {
+			for (var i = 0; i < list.length; i++) {
+				var id = String(list[i].id);
+				var item = this._itemNodesMap[id];
+
+				if (item) {
+					item = item[0];
+					this._expandNode(item);
+				}
+			}
+		} catch (e) {
+			exception_error("expandParentNodes", e);
 		}
+	},
+	findNodeParentsAndExpandThem: function(feed, is_cat, root, parents) {
+		// expands all parents of specified feed to properly mark it as active
+		// my fav thing about frameworks is doing everything myself
+		try {
+			var test_id = is_cat ? 'CAT:' + feed : 'FEED:' + feed;
+
+			if (!root) {
+				if (!this.model || !this.model.store) return false;
+
+				var items = this.model.store._arrayOfTopLevelItems;
 
-		return label;
+				for (var i = 0; i < items.length; i++) {
+					if (String(items[i].id) == test_id) {
+						this.expandParentNodes(feed, is_cat, parents);
+					} else {
+						this.findNodeParentsAndExpandThem(feed, is_cat, items[i], []);
+					}
+				}
+			} else {
+				if (root.items) {
+					parents.push(root);
+
+					for (var i = 0; i < root.items.length; i++) {
+						if (String(root.items[i].id) == test_id) {
+							this.expandParentNodes(feed, is_cat, parents);
+						} else {
+							this.findNodeParentsAndExpandThem(feed, is_cat, root.items[i], parents.slice(0));
+						}
+					}
+				} else {
+					if (String(root.id) == test_id) {
+						this.expandParentNodes(feed, is_cat, parents.slice(0));
+					}
+				}
+			}
+		} catch (e) {
+			exception_error("findNodeParentsAndExpandThem", e);
+		}
 	},
 	selectFeed: function(feed, is_cat) {
+		this.findNodeParentsAndExpandThem(feed, is_cat, false, false);
+
 		if (is_cat)
 			treeNode = this._itemNodesMap['CAT:' + feed];
 		else
@@ -243,8 +352,13 @@ dojo.declare("fox.FeedTree", dijit.Tree, {
 
 		if (treeNode) {
 			treeNode = treeNode[0];
-			treeNode.expandoNode.src = src;
-			return true;
+			if (treeNode.loadingNode) {
+				treeNode.loadingNode.src = src;
+				return true;
+			} else {
+				treeNode.expandoNode.src = src;
+				return true;
+			}
 		}
 
 		return false;
@@ -309,7 +423,7 @@ dojo.declare("fox.FeedTree", dijit.Tree, {
 				var node = tree._itemNodesMap[id];
 
 				if (node) {
-					if (hide && unread == 0 && (bare_id > 0 || !show_special)) {
+					if (hide && unread == 0 && (bare_id > 0 || bare_id < _label_base_index || !show_special)) {
 						Effect.Fade(node[0].rowNode, {duration : 0.3,
 							queue: { position: 'end', scope: 'FFADE-' + id, limit: 1 }});
 					} else {