From 8280b522a56433c8623df226ce0402fdac070289 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Tue, 21 Aug 2018 15:51:53 +0200 Subject: [PATCH] use infinite media picker in markdown editor --- .../markdowneditor.controller.js | 34 +++++++------------ 1 file changed, 13 insertions(+), 21 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/markdowneditor/markdowneditor.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/markdowneditor/markdowneditor.controller.js index 89de8e7038..639c24f54c 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/markdowneditor/markdowneditor.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/markdowneditor/markdowneditor.controller.js @@ -1,5 +1,5 @@ //inject umbracos assetsServce and dialog service -function MarkdownEditorController($scope, $element, assetsService, dialogService, angularHelper, $timeout) { +function MarkdownEditorController($scope, $element, assetsService, editorService, angularHelper, $timeout) { //tell the assets service to load the markdown.editor libs from the markdown editors //plugin folder @@ -9,26 +9,18 @@ function MarkdownEditorController($scope, $element, assetsService, dialogService } function openMediaPicker(callback) { - - $scope.mediaPickerOverlay = {}; - $scope.mediaPickerOverlay.view = "mediaPicker"; - $scope.mediaPickerOverlay.show = true; - $scope.mediaPickerOverlay.disableFolderSelect = true; - - $scope.mediaPickerOverlay.submit = function(model) { - - var selectedImagePath = model.selectedImages[0].image; - callback(selectedImagePath); - - $scope.mediaPickerOverlay.show = false; - $scope.mediaPickerOverlay = null; - }; - - $scope.mediaPickerOverlay.close = function(model) { - $scope.mediaPickerOverlay.show = false; - $scope.mediaPickerOverlay = null; - }; - + var mediaPicker = { + disableFolderSelect: true, + submit: function(model) { + var selectedImagePath = model.selectedImages[0].image; + callback(selectedImagePath); + editorService.close(); + }, + close: function() { + editorService.close(); + } + }; + editorService.mediaPicker(mediaPicker); } assetsService