diff --git a/FeedTree.js b/FeedTree.js index f2e82d13..d1caeba7 100644 --- a/FeedTree.js +++ b/FeedTree.js @@ -134,7 +134,7 @@ dojo.declare("fox.FeedTree", dijit.Tree, { tnode._menu = menu; } - //tnode.labelNode.innerHTML = args.label; + tnode.labelNode.innerHTML = args.label; return tnode; }, getIconClass: function (item, opened) { @@ -251,6 +251,25 @@ dojo.declare("fox.FeedTree", dijit.Tree, { return cat_unread; }, + collapseCat: function(id) { + if (!this.model.hasCats()) return; + + var tree = this; + + var node = tree._itemNodesMap['CAT:' + id][0]; + var item = tree.model.store._itemsByIdentity['CAT:' + id]; + + if (node && item) { + var hidden = tree.model.store.getValue(item, 'hidden'); + + if (hidden) + tree._expandNode(node); + else + tree._collapseNode(node); + + tree.model.store.setValue(item, 'hidden', !hidden); + } + }, collapseHiddenCats: function() { if (!this.model.hasCats()) return; diff --git a/tt-rss.js b/tt-rss.js index d619c4c0..546c2213 100644 --- a/tt-rss.js +++ b/tt-rss.js @@ -808,7 +808,7 @@ function hotkey_handler(e) { if (keycode == 88) { // x if (activeFeedIsCat()) { - toggleCollapseCat(getActiveFeedId()); + dijit.byId("feedTree").collapseCat(getActiveFeedId()); } } }