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

Merge pull request #327 from Jeavon/7.1.0-ImageCropper-JeavonWIP

Browse Source 
7.1.0 image cropper - GetCropUrl not using .Url anymore
This commit is contained in:
Sebastiaan Janssen
2014-03-20 15:45:24 +01:00
parent c43ab7942a 5c5827e319
commit 7bc2bdae75
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/Umbraco.Web/ImageCropperTemplateExtensions.cs
View File

@@ -51,15 +51,26 @@ namespace Umbraco.Web
{
string imageCropperValue = null;
string mediaItemUrl = null;
string mediaItemUrl;
if (mediaItem.HasPropertyAndValueAndCrop(propertyAlias, cropAlias))
{
imageCropperValue = mediaItem.GetPropertyValue<string>(propertyAlias);
//get the raw value (this will be json)
var urlValue = mediaItem.GetPropertyValue<string>(propertyAlias);
mediaItemUrl = urlValue.DetectIsJson()
? urlValue.SerializeToCropDataSet().Src
: urlValue;
}
else
{
mediaItemUrl = mediaItem.Url;
}
return mediaItem.Url != null
? GetCropUrl(mediaItem.Url, width, height, quality, imageCropMode, imageCropAnchor, imageCropperValue, cropAlias, furtherOptions)
return mediaItemUrl != null
? GetCropUrl(mediaItemUrl, width, height, quality, imageCropMode, imageCropAnchor, imageCropperValue, cropAlias, furtherOptions)
: string.Empty;
}