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

Fixed creation of image processing options in grid media controller.

Browse Source
This commit is contained in:
Andy Butland
2020-03-28 13:59:52 +01:00
parent f48a4b0c72
commit 93fd2eb954
1 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js
View File

@@ -2,7 +2,7 @@ angular.module("umbraco")
.controller("Umbraco.PropertyEditors.Grid.MediaController",
function ($scope, userService, editorService, mediaHelper) {
$scope.thumbnailUrl = getThumbnailUrl();
setThumbnailUrl();
if (!$scope.model.config.startNodeId) {
if ($scope.model.config.ignoreUserStartNodes === true) {
@@ -55,26 +55,24 @@ angular.module("umbraco")
return; // simply skip that
}
$scope.thumbnailUrl = getThumbnailUrl();
setThumbnailUrl();
}, true);
function getThumbnailUrl() {
function setThumbnailUrl() {
if ($scope.control.value && $scope.control.value.image) {
var imageOptions;
var url = $scope.control.value.image;
var imageOptions = {};
if (url.indexOf('?') == -1) {
// set default size if no crop present (moved from the view)
imageOptions = {
animationprocessmode : false,
width: 800
}
imageOptions.animationprocessmode = false;
imageOptions.width = 800;
}
else {
imageOptions = {
animationprocessmode: "first",
height: $scope.control.editor.config.size.height,
width: $scope.control.editor.config.size.width
};
if ($scope.control.editor.config && $scope.control.editor.config.size) {
imageOptions.animationprocessmode = "first";
imageOptions.height = $scope.control.editor.config.size.height;
imageOptions.width = $scope.control.editor.config.size.width;
}
if ($scope.control.value.focalPoint) {
imageOptions.focalPoint = {
@@ -85,13 +83,11 @@ angular.module("umbraco")
}
}
return mediaHelper.getProcessedImageUrl($scope.control.value.image, imageOptions)
mediaHelper.getProcessedImageUrl($scope.control.value.image, imageOptions)
.then(function (url) {
return url;
$scope.thumbnailUrl = url;
});
}
return null;
};
});