remove server-side feedtree collapse implementation

2 files changed, 1 insertions, 42 deletions

diff --git a/js/FeedTree.js b/js/FeedTree.js
index b8fb93ca0..2cb6346e4 100644
--- a/js/FeedTree.js
+++ b/js/FeedTree.js
@@ -331,34 +331,13 @@ dojo.declare("fox.FeedTree", dijit.Tree, {
 		var item = tree.model.store._itemsByIdentity['CAT:' + id];
 
 		if (node && item) {
-			var hidden = tree.model.store.getValue(item, 'hidden');
-
-			if (hidden)
+			if (!node.isExpanded)
 				tree._expandNode(node);
 			else
 				tree._collapseNode(node);
 
-			tree.model.store.setValue(item, 'hidden', !hidden);
 		}
 	},
-	collapseHiddenCats: function() {
-		if (!this.model.hasCats()) return;
-
-		var cats = this.model.store._arrayOfTopLevelItems;
-		var tree = this;
-
-		dojo.forEach(cats, function(cat) {
-			var hidden = tree.model.store.getValue(cat, 'hidden');
-			var id = tree.model.store.getValue(cat, 'id');
-			var node = tree._itemNodesMap[id][0];
-
-			if (hidden)
-				tree._collapseNode(node);
-			else
-				tree._expandNode(node);
-
-		});
-	},
 	getVisibleUnreadFeeds: function() {
 		var items = this.model.store._arrayOfAllItems;
 		var rv = [];
diff --git a/js/tt-rss.js b/js/tt-rss.js
index 3a0504d55..530cb2931 100644
--- a/js/tt-rss.js
+++ b/js/tt-rss.js
@@ -69,25 +69,7 @@ function updateFeedList() {
 		});
 
 		var tree = new fox.FeedTree({
-		persist: false,
 		model: treeModel,
-		onOpen: function (item, node) {
-			var id = String(item.id);
-			var cat_id = id.substr(id.indexOf(":")+1);
-
-			new Ajax.Request("backend.php",
-				{ parameters: "backend.php?op=feeds&method=collapse&cid=" +
-					param_escape(cat_id) + "&mode=0" } );
-	   },
-		onClose: function (item, node) {
-			var id = String(item.id);
-			var cat_id = id.substr(id.indexOf(":")+1);
-
-			new Ajax.Request("backend.php",
-				{ parameters: "backend.php?op=feeds&method=collapse&cid=" +
-					param_escape(cat_id) + "&mode=1" } );
-
-	   },
 		onClick: function (item, node) {
 			var id = String(item.id);
 			var is_cat = id.match("^CAT:");
@@ -119,8 +101,6 @@ function updateFeedList() {
 	   	dojo.disconnect(tmph);
 			Element.hide("feedlistLoading");
 
-			tree.collapseHiddenCats();
-
 			feedlist_init();
 
 //			var node = dijit.byId("feedTree")._itemNodesMap['FEED:-2'][0].domNode