yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

U4-4532 Unable to insert Image in TinyMCE when Image property 'umbracoFile' is changed from type 'Upload' to the new 'Image Cropper'

Browse Source 
Replaces the old media api with the resolveFile helper methods
This commit is contained in:
perploug
2014-03-27 02:46:32 -07:00
parent c01211c62d
commit c4e2d98138
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.controller.js
View File

@@ -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);
}});
};

2
src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.controller.js
View File

@@ -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);
}
}
};