Merge branch 'nested-cats'

1 files changed, 14 insertions, 2 deletions

diff --git a/js/tt-rss.js b/js/tt-rss.js
index ef5d72e5b..8a82e4c7d 100644
--- a/js/tt-rss.js
+++ b/js/tt-rss.js
@@ -42,6 +42,9 @@ function setActiveFeedId(id, is_cat) {
 
 		selectFeed(id, is_cat);
 
+		dijit.byId("include_children").attr("disabled", !(is_cat && id > 0));
+
+
 	} catch (e) {
 		exception_error("setActiveFeedId", e);
 	}
@@ -61,12 +64,12 @@ function updateFeedList() {
 		}
 
 		var store = new dojo.data.ItemFileWriteStore({
-         url: "backend.php?op=feeds"});
+         url: "backend.php?op=pref_feeds&method=getfeedtree&mode=2"});
 
 		var treeModel = new fox.FeedStoreModel({
 			store: store,
 			query: {
-				"type": "feed"
+				"type": getInitParam('enable_feed_cats') == 1 ? "category" : "feed"
 			},
 			rootId: "root",
 			rootLabel: "Feeds",
@@ -105,6 +108,8 @@ function updateFeedList() {
 		id: "feedTree",
 		}, "feedTree");
 
+		_force_scheduled_update = true;
+
 /*		var menu = new dijit.Menu({id: 'feedMenu'});
 
 		menu.addChild(new dijit.MenuItem({
@@ -324,6 +329,13 @@ function init_second_stage() {
 		dijit.getEnclosingWidget(toolbar.order_by).attr('value',
 			getInitParam("default_view_order_by"));
 
+
+		if (getInitParam("enable_feed_cats") == 0)
+			Element.hide(dijit.byId("include_children").domNode);
+
+		dijit.byId("include_children").attr("checked",
+			getInitParam("default_include_children"));
+
 		feeds_sort_by_unread = getInitParam("feeds_sort_by_unread") == 1;
 
 		loading_set_progress(30);