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

Fixes TextStringValueConverter to include the text box and multi-textbox (since it's like that in the Core one that this overrides), adds new converter for Image cropper including ToString converter & custom type converter to convert from the strongly typed object to JObject, adds test to support this, adds equatable methods for the strongly typed model so it can be easily compared. Ensures that the webboot manager does not include the core value converter for image cropper.

Browse Source
This commit is contained in:
Shannon
2016-02-04 16:03:43 +01:00
parent c346e62176
commit 0829bae5b2
16 changed files with 640 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/Umbraco.Web/ImageCropperBaseExtensions.cs
View File

@@ -1,38 +1,18 @@
namespace Umbraco.Web
using System;
using System.Collections.Generic;
using System.Globalization;
using System.Linq;
using System.Text;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Umbraco.Core;
using Umbraco.Core.Logging;
using Umbraco.Web.Models;
namespace Umbraco.Web
{
using System;
using System.Collections.Generic;
using System.Globalization;
using System.Linq;
using System.Text;
using Newtonsoft.Json;
using Umbraco.Core;
using Umbraco.Core.Logging;
using Umbraco.Web.Models;
internal static class ImageCropperBaseExtensions
{
internal static ImageCropData GetImageCrop(this string json, string id)
{
var ic = new ImageCropData();
if (json.DetectIsJson())
{
try
{
var imageCropperSettings = JsonConvert.DeserializeObject<List<ImageCropData>>(json);
ic = imageCropperSettings.GetCrop(id);
}
catch (Exception ex)
{
LogHelper.Error(typeof(ImageCropperBaseExtensions), "Could not parse the json string: " + json, ex);
}
}
return ic;
}
internal static ImageCropDataSet SerializeToCropDataSet(this string json)
{
var imageCrops = new ImageCropDataSet();
@@ -40,7 +20,11 @@
{
try
{
imageCrops = JsonConvert.DeserializeObject<ImageCropDataSet>(json);
imageCrops = JsonConvert.DeserializeObject<ImageCropDataSet>(json, new JsonSerializerSettings
{
Culture = CultureInfo.InvariantCulture,
FloatParseHandling = FloatParseHandling.Decimal
});
}
catch (Exception ex)
{
@@ -61,13 +45,14 @@
internal static ImageCropData GetCrop(this IEnumerable<ImageCropData> dataset, string cropAlias)
{
if (dataset == null || !dataset.Any())
var imageCropDatas = dataset.ToArray();
if (dataset == null || imageCropDatas.Any() == false)
return null;
if (string.IsNullOrEmpty(cropAlias))
return dataset.FirstOrDefault();
return imageCropDatas.FirstOrDefault();
return dataset.FirstOrDefault(x => x.Alias.ToLowerInvariant() == cropAlias.ToLowerInvariant());
return imageCropDatas.FirstOrDefault(x => x.Alias.ToLowerInvariant() == cropAlias.ToLowerInvariant());
}
internal static string GetCropBaseUrl(this ImageCropDataSet cropDataSet, string cropAlias, bool preferFocalPoint)