From c4e2d9813842bf0e4e2c694d15e3086cd1ee1f37 Mon Sep 17 00:00:00 2001 From: perploug Date: Thu, 27 Mar 2014 02:46:32 -0700 Subject: [PATCH] U4-4532 Unable to insert Image in TinyMCE when Image property 'umbracoFile' is changed from type 'Upload' to the new 'Image Cropper' Replaces the old media api with the resolveFile helper methods --- .../src/views/common/dialogs/linkpicker.controller.js | 4 ++-- .../src/views/common/dialogs/mediapicker.controller.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.controller.js index 0c10387211..8fdc828ffc 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.controller.js @@ -9,7 +9,7 @@ angular.module("umbraco").controller("Umbraco.Dialogs.LinkPickerController", if(dialogOptions.currentTarget){ $scope.target = dialogOptions.currentTarget; - //if we a node ID, we fetch the current node to build the form data + //if we have a node ID, we fetch the current node to build the form data if($scope.target.id){ if(!$scope.target.path) { @@ -30,7 +30,7 @@ angular.module("umbraco").controller("Umbraco.Dialogs.LinkPickerController", dialogService.mediaPicker({callback: function(media){ $scope.target.id = undefined; $scope.target.name = media.name; - $scope.target.url = mediaHelper.getMediaPropertyValue({mediaModel: media}); + $scope.target.url = mediaHelper.resolveFile(media); }}); }; diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.controller.js index 7d03407bad..c9101587fe 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.controller.js @@ -101,7 +101,7 @@ angular.module("umbraco") image.cssclass = ($scope.dialogData.selection.indexOf(image) > -1) ? "selected" : ""; }else { $scope.target= image; - $scope.target.url = mediaHelper.resolveFile(image); // getMediaPropertyValue({mediaModel: image}); + $scope.target.url = mediaHelper.resolveFile(image); } } };