From 3e22598f4a0ec4be50082d5d5d5fc79dd15d8be7 Mon Sep 17 00:00:00 2001 From: perploug Date: Fri, 24 Jan 2014 18:38:47 +0100 Subject: [PATCH] fixes mntp filtering --- .../src/common/directives/umbtree.directive.js | 5 +++-- .../src/views/common/dialogs/treepicker.controller.js | 10 ++++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/umbtree.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/umbtree.directive.js index 2c60a87db2..164b05ba03 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/umbtree.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/umbtree.directive.js @@ -235,8 +235,9 @@ function umbTreeDirective($compile, $log, $q, $rootScope, treeService, notificat //set the root as the current active tree scope.activeTree = scope.tree.root; - emitEvent("treeLoaded", { tree: scope.tree.root }); - + emitEvent("treeLoaded", { tree: scope.tree }); + emitEvent("treeNodeExpanded", { tree: scope.tree, node: scope.tree.root, children: scope.tree.root.children }); + }, function(reason) { scope.loading = false; notificationsService.error("Tree Error", reason); diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/treepicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/treepicker.controller.js index 4d7fd6be09..da55d80529 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/treepicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/treepicker.controller.js @@ -40,11 +40,11 @@ angular.module("umbraco").controller("Umbraco.Dialogs.TreePickerController", //Configures filtering if (dialogOptions.filter) { - dialogOptions.filterExclude = true; + dialogOptions.filterExclude = false; dialogOptions.filterAdvanced = false; if(dialogOptions.filter[0] === "!"){ - dialogOptions.filterExclude = false; + dialogOptions.filterExclude = true; dialogOptions.filter = dialogOptions.filter.substring(1); } @@ -112,8 +112,10 @@ angular.module("umbraco").controller("Umbraco.Dialogs.TreePickerController", angular.forEach(nodes, function (value, key) { var found = a.indexOf(value.metaData.contentType) >= 0; - if ((dialogOptions.filterExclude && found) || !found) { - value.filtered = true; + + if (!dialogOptions.filterExclude && !found || dialogOptions.filterExclude && found){ + value.filtered = true; + if(dialogOptions.filterCssClass){ value.cssClasses.push(dialogOptions.filterCssClass); }