From e74112ee2a0e1ee65152acc3f997d97b6a468ef9 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Wed, 4 Jul 2018 13:44:20 +0200
Subject: [PATCH] use infinite tree picker in related links property editor

---
 .../relatedlinks/relatedlinks.controller.js   | 66 ++++++++-----------
 .../relatedlinks/relatedlinks.html            |  7 --
 2 files changed, 26 insertions(+), 47 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.controller.js
index e0ba9e57b3..8aea4fb97f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.controller.js
@@ -1,6 +1,6 @@
 angular.module("umbraco")
     .controller("Umbraco.PropertyEditors.RelatedLinksController",
-        function ($rootScope, $scope, dialogService, iconHelper) {
+        function ($rootScope, $scope, dialogService, iconHelper, editorService) {
 
             if (!$scope.model.value) {
                 $scope.model.value = [];
@@ -18,61 +18,47 @@
             $scope.currentEditLink = null;
             $scope.hasError = false;
 
-            $scope.internal = function($event) {
-               $scope.currentEditLink = null;
+            $scope.internal = function ($event) {
+                $scope.currentEditLink = null;
 
-                $scope.contentPickerOverlay = {
-                    view: "treepicker",
+                var contentPicker = {
                     section: "content",
                     treeAlias: "content",
                     multiPicker: false,
-                    show: true,
-                    idType: $scope.model.config.idType ? $scope.model.config.idType : "int"
+                    idType: $scope.model.config.idType ? $scope.model.config.idType : "int",
+                    submit: function (model) {
+                        select(model.selection[0]);
+                        editorService.close();
+                    },
+                    close: function () {
+                        editorService.close();
+                    }
                 };
 
-               $scope.contentPickerOverlay.submit = function(model) {
+                editorService.treePicker(contentPicker);
 
-                  select(model.selection[0]);
-
-                  $scope.contentPickerOverlay.show = false;
-                  $scope.contentPickerOverlay = null;
-               };
-
-               $scope.contentPickerOverlay.close = function(oldModel) {
-                  $scope.contentPickerOverlay.show = false;
-                  $scope.contentPickerOverlay = null;
-               };
-
-               $event.preventDefault();
+                $event.preventDefault();
             };
 
             $scope.selectInternal = function ($event, link) {
-               $scope.currentEditLink = link;
+                $scope.currentEditLink = link;
 
-                $scope.contentPickerOverlay = {
-                    view: "treepicker",
+                var contentPicker = {
                     section: "content",
                     treeAlias: "content",
                     multiPicker: false,
-                    show: true,
-                    idType: $scope.model.config.idType ? $scope.model.config.idType : "int"
+                    idType: $scope.model.config.idType ? $scope.model.config.idType : "int",
+                    submit: function (model) {
+                        select(model.selection[0]);
+                        editorService.close();
+                    },
+                    close: function () {
+                        editorService.close();
+                    }
                 };
-               
-               $scope.contentPickerOverlay.submit = function(model) {
-
-                  select(model.selection[0]);
-
-                  $scope.contentPickerOverlay.show = false;
-                  $scope.contentPickerOverlay = null;
-               };
-
-               $scope.contentPickerOverlay.close = function(oldModel) {
-                  $scope.contentPickerOverlay.show = false;
-                  $scope.contentPickerOverlay = null;
-               };
-
-               $event.preventDefault();
+                editorService.treePicker(contentPicker);
 
+                $event.preventDefault();
             };
 
             $scope.edit = function (idx) {
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.html
index c9c81b3021..221e7666f7 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.html
@@ -88,11 +88,4 @@
         </tfoot>
     </table>
 
-   <umb-overlay
-      ng-if="contentPickerOverlay.show"
-      model="contentPickerOverlay"
-      view="contentPickerOverlay.view"
-      position="right">
-   </umb-overlay>
-
 </div>
\ No newline at end of file