From 18efe25167fdcdc1b4d7a00d42861c8b2b8e4dd1 Mon Sep 17 00:00:00 2001 From: Shannon Date: Thu, 9 Oct 2014 00:04:25 +1100 Subject: [PATCH] removes unneeded contentpicker dialog and just uses the standard tree picker that has the correct search built in, now search is working for the link picker. --- .../src/common/services/dialog.service.js | 10 ++- .../dialogs/contentpicker.controller.js | 83 ------------------- .../views/common/dialogs/contentpicker.html | 66 --------------- .../src/views/common/dialogs/treepicker.html | 2 +- src/Umbraco.Web/Trees/MediaTreeController.cs | 5 +- src/Umbraco.Web/Trees/MemberTreeController.cs | 3 + 6 files changed, 13 insertions(+), 156 deletions(-) delete mode 100644 src/Umbraco.Web.UI.Client/src/views/common/dialogs/contentpicker.controller.js delete mode 100644 src/Umbraco.Web.UI.Client/src/views/common/dialogs/contentpicker.html diff --git a/src/Umbraco.Web.UI.Client/src/common/services/dialog.service.js b/src/Umbraco.Web.UI.Client/src/common/services/dialog.service.js index 5418c41871..802076acb9 100644 --- a/src/Umbraco.Web.UI.Client/src/common/services/dialog.service.js +++ b/src/Umbraco.Web.UI.Client/src/common/services/dialog.service.js @@ -368,10 +368,12 @@ angular.module('umbraco.services') * @param {Function} options.callback callback function * @returns {Object} modal object */ - contentPicker: function (options) { - options.template = 'views/common/dialogs/contentPicker.html'; - options.show = true; - return openDialog(options); + contentPicker: function (options) { + + options.treeAlias = "content"; + options.section = "content"; + + return this.treePicker(options); }, /** diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/contentpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/contentpicker.controller.js deleted file mode 100644 index 949c75f983..0000000000 --- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/contentpicker.controller.js +++ /dev/null @@ -1,83 +0,0 @@ - -//TODO: SD: Pretty sure we don't want this anymore and we should just be using the treepicker.html instead for all tree picking. - -//used for the content picker dialog -angular.module("umbraco").controller("Umbraco.Dialogs.ContentPickerController", - function ($scope, eventsService, entityResource, searchService, $log) { - var dialogOptions = $scope.dialogOptions; - $scope.dialogTreeEventHandler = $({}); - $scope.results = []; - - $scope.selectResult = function (result) { - entityResource.getById(result.id, "Document").then(function (ent) { - if (dialogOptions && dialogOptions.multiPicker) { - - $scope.showSearch = false; - $scope.results = []; - $scope.term = ""; - $scope.oldTerm = undefined; - - $scope.select(ent); - } else { - $scope.submit(ent); - } - }); - }; - - $scope.performSearch = function () { - if ($scope.term) { - if ($scope.oldTerm !== $scope.term) { - $scope.results = []; - searchService.searchContent({ term: $scope.term }).then(function (data) { - $scope.results = data; - }); - $scope.showSearch = true; - $scope.oldTerm = $scope.term; - } - } else { - $scope.oldTerm = ""; - $scope.showSearch = false; - $scope.results = []; - } - }; - - function nodeSelectHandler (ev, args) { - args.event.preventDefault(); - args.event.stopPropagation(); - - eventsService.emit("dialogs.contentPicker.select", args); - - if (dialogOptions && dialogOptions.multiPicker) { - - var c = $(args.event.target.parentElement); - if (!args.node.selected) { - args.node.selected = true; - - var temp = ""; - var icon = c.find("i.umb-tree-icon"); - if (icon.length > 0) { - icon.hide().after(temp); - } else { - c.prepend(temp); - } - - } else { - args.node.selected = false; - c.find(".temporary").remove(); - c.find("i.umb-tree-icon").show(); - } - - $scope.select(args.node); - - } else { - $scope.submit(args.node); - } - - } - - $scope.dialogTreeEventHandler.bind("treeNodeSelect", nodeSelectHandler); - - $scope.$on('$destroy', function () { - $scope.dialogTreeEventHandler.unbind("treeNodeSelect", nodeSelectHandler); - }); - }); \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/contentpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/contentpicker.html deleted file mode 100644 index 0932b63286..0000000000 --- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/contentpicker.html +++ /dev/null @@ -1,66 +0,0 @@ -
-
-
-
- - -
-
-
-
- -
- -
- -
- - -
-
- -
-
-
- - - Cancel - - - - -
-
-
-
\ No newline at end of file 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 d6b343527c..6088c3de06 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 @@ -3,7 +3,7 @@
- + x.MenuUrl = null); + //All nodes are containers + nodes.ForEach(x => x.AdditionalData.Add("isContainer", true)); return nodes; }