From 96b2e9a83280d60d22cf472e9e41ecb559cb0dab Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Mon, 21 Sep 2015 08:58:31 +0200
Subject: [PATCH] open preValue media picker in new overlay

---
 .../prevalueeditors/mediapicker.controller.js | 42 ++++++++++++-------
 .../views/prevalueeditors/mediapicker.html    | 10 ++++-
 2 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/mediapicker.controller.js
index 5f232555dc..38dd99c204 100644
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/mediapicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/mediapicker.controller.js
@@ -13,23 +13,35 @@ function mediaPickerController($scope, dialogService, entityResource, $log, icon
         multiPicker: false,
         entityType: "Media",
         section: "media",
-        treeAlias: "media",
-        callback: function(data) {
-            if (angular.isArray(data)) {
-                _.each(data, function (item, i) {
-                    $scope.add(item);
-                });
-            }
-            else {
-                $scope.clear();
-                $scope.add(data);
-            }
-        }
+        treeAlias: "media"
     };
 
-    $scope.openContentPicker = function(){
-        var d = dialogService.treePicker(dialogOptions);
-    };
+    $scope.openContentPicker = function() {
+      $scope.contentPickerOverlay = dialogOptions;
+      $scope.contentPickerOverlay.view = "treePicker";
+      $scope.contentPickerOverlay.show = true;
+
+      $scope.contentPickerOverlay.submit = function(model) {
+
+         if ($scope.contentPickerOverlay.multiPicker) {
+             _.each(model.selection, function (item, i) {
+                 $scope.add(item);
+             });
+         }
+         else {
+             $scope.clear();
+             $scope.add(model.selection[0]);
+         }
+
+         $scope.contentPickerOverlay.show = false;
+         $scope.contentPickerOverlay = null;
+      };
+
+      $scope.contentPickerOverlay.close = function(oldModel) {
+         $scope.contentPickerOverlay.show = false;
+         $scope.contentPickerOverlay = null;
+      };
+    }
 
     $scope.remove =function(index, event){
         event.preventDefault();
diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/mediapicker.html b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/mediapicker.html
index 2130490232..978ae63ece 100644
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/mediapicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/mediapicker.html
@@ -19,4 +19,12 @@
 		</a>
 	</li>
 </ul>
-</div>
\ No newline at end of file
+
+<umb-overlay
+	ng-if="contentPickerOverlay.show"
+	model="contentPickerOverlay"
+	position="right"
+	view="contentPickerOverlay.view">
+</umb-overlay>
+
+</div>