From 39d9e98f6a08a644cdb65087310f7f69480419db Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Tue, 29 Sep 2015 11:39:22 +0200
Subject: [PATCH] use new overlay directive in related links property editor

---
 .../relatedlinks/relatedlinks.controller.js   | 62 +++++++++++++++----
 .../relatedlinks/relatedlinks.html            | 12 +++-
 2 files changed, 60 insertions(+), 14 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 6abd80cbcd..26d9768c29 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
@@ -15,17 +15,55 @@
             $scope.currentEditLink = null;
             $scope.hasError = false;
 
-            $scope.internal = function ($event) {
-                $scope.currentEditLink = null;
-                var d = dialogService.contentPicker({ multipicker: false, callback: select });
-                $event.preventDefault();
-            };
-            
-            $scope.selectInternal = function ($event, link) {
+            $scope.internal = function($event) {
+
+               $scope.currentEditLink = null;
+
+               $scope.contentPickerOverlay = {};
+               $scope.contentPickerOverlay.view = "contentpicker";
+               $scope.contentPickerOverlay.multiPicker = false;
+               $scope.contentPickerOverlay.show = true;
+
+               $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();
+            };
+
+            $scope.selectInternal = function($event, link) {
+
+               $scope.currentEditLink = link;
+
+               $scope.contentPickerOverlay = {};
+               $scope.contentPickerOverlay.view = "contentpicker";
+               $scope.contentPickerOverlay.multiPicker = false;
+               $scope.contentPickerOverlay.show = true;
+
+               $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();
 
-                $scope.currentEditLink = link;
-                var d = dialogService.contentPicker({ multipicker: false, callback: select });
-                $event.preventDefault();
             };
 
             $scope.edit = function (idx) {
@@ -147,5 +185,5 @@
                     $scope.newInternal = data.id;
                     $scope.newInternalName = data.name;
                 }
-            }            
-        });
\ No newline at end of file
+            }
+        });
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 2f32f3875c..a5eae94491 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
@@ -1,5 +1,5 @@
 <div class="umb-editor umb-relatedlinks" ng-controller="Umbraco.PropertyEditors.RelatedLinksController">
-    
+
     <table class="table table-striped">
         <thead>
             <tr>
@@ -78,4 +78,12 @@
             </tr>
         </tfoot>
     </table>
-</div>
\ No newline at end of file
+
+   <umb-overlay
+      ng-if="contentPickerOverlay.show"
+      model="contentPickerOverlay"
+      view="contentPickerOverlay.view"
+      position="right">
+   </umb-overlay>
+
+</div>