From c61c130ddf52145d0dea8a76da9958f4f6e6e063 Mon Sep 17 00:00:00 2001 From: Shannon Date: Wed, 8 Oct 2014 14:35:57 +1100 Subject: [PATCH] WIP: working on tree picker with search for list views --- src/Umbraco.Web.UI.Client/src/less/forms.less | 4 ++-- .../src/views/common/dialogs/treepicker.controller.js | 11 ++++------- .../src/views/common/dialogs/treepicker.html | 4 ++-- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/less/forms.less b/src/Umbraco.Web.UI.Client/src/less/forms.less index 38f0f5fb2b..363a43203b 100644 --- a/src/Umbraco.Web.UI.Client/src/less/forms.less +++ b/src/Umbraco.Web.UI.Client/src/less/forms.less @@ -50,7 +50,7 @@ label.control-label { } .form-search a{ text-decoration:none; - color: @grayLight; + cursor:pointer; } .form-search a:hover{ color: @gray; @@ -61,7 +61,7 @@ label.control-label { .form-search small { color: @grayLight; } -.form-search .icon-search { +.form-search .icon, .form-search .icon-search { position: absolute; top: 6px; left: 4px; 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 22b9119ad2..9601ca649a 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 @@ -104,11 +104,7 @@ angular.module("umbraco").controller("Umbraco.Dialogs.TreePickerController", } } else { - - $scope.results = []; - $scope.term = ""; - $scope.oldTerm = undefined; - + $scope.hideSearch(); //if an entity has been passed in, use it @@ -167,6 +163,9 @@ angular.module("umbraco").controller("Umbraco.Dialogs.TreePickerController", $scope.hideSearch = function() { $scope.showSearch = false; $scope.searchSubHeader = null; + $scope.term = ""; + $scope.oldTerm = ""; + $scope.results = []; } //handles the on key up for searching, but we don't want to over query so the result is debounced @@ -193,9 +192,7 @@ angular.module("umbraco").controller("Umbraco.Dialogs.TreePickerController", else { //if (!$scope.searchSubHeader) { - // $scope.oldTerm = ""; // $scope.hideSearch(); - // $scope.results = []; //} } diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/treepicker.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/treepicker.html index 57c4271fa9..42ddf4608c 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/treepicker.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/treepicker.html @@ -2,8 +2,8 @@