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

Ensures media.Url works properly

Browse Source
This commit is contained in:
Shannon
2016-02-04 17:14:29 +01:00
parent fe0ed2ceea
commit fd984bd613
1 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/Umbraco.Web/Models/PublishedContentBase.cs
View File

@@ -1,6 +1,9 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Globalization;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Umbraco.Core;
using Umbraco.Core.Models;
using Umbraco.Core.Models.PublishedContent;
@@ -64,9 +67,22 @@ namespace Umbraco.Web.Models
break;
case Constants.PropertyEditors.ImageCropperAlias:
//get the url from the json format
var val = prop.Value.ToString();
var crops = val.SerializeToCropDataSet();
_url = crops != null ? crops.Src : string.Empty;
var stronglyTyped = prop.Value as ImageCropDataSet;
if (stronglyTyped != null)
{
_url = stronglyTyped.Src;
break;
}
var json = prop.Value as JObject;
if (json != null)
{
_url = json.ToObject<ImageCropDataSet>(new JsonSerializer { Culture = CultureInfo.InvariantCulture, FloatParseHandling = FloatParseHandling.Decimal }).Src;
break;
}
_url = prop.Value.ToString();
break;
}
break;