diff --git a/src/Umbraco.Tests/PropertyEditors/ImageCropperTest.cs b/src/Umbraco.Tests/PropertyEditors/ImageCropperTest.cs index 450c69abb4..c8372e70ac 100644 --- a/src/Umbraco.Tests/PropertyEditors/ImageCropperTest.cs +++ b/src/Umbraco.Tests/PropertyEditors/ImageCropperTest.cs @@ -261,8 +261,17 @@ namespace Umbraco.Tests.PropertyEditors [Test] public void GetCropUrl_SpecifiedCropModeTest() { - var urlString = mediaPath.GetCropUrl(imageCropperValue: cropperJson1, width: 300, height: 150, imageCropMode:ImageCropMode.Max); - Assert.AreEqual(mediaPath + "?mode=max&width=300&height=150", urlString); + var urlStringMin = mediaPath.GetCropUrl(imageCropperValue: cropperJson1, width: 300, height: 150, imageCropMode: ImageCropMode.Min); + var urlStringBoxPad = mediaPath.GetCropUrl(imageCropperValue: cropperJson1, width: 300, height: 150, imageCropMode: ImageCropMode.BoxPad); + var urlStringPad = mediaPath.GetCropUrl(imageCropperValue: cropperJson1, width: 300, height: 150, imageCropMode: ImageCropMode.Pad); + var urlStringMax = mediaPath.GetCropUrl(imageCropperValue: cropperJson1, width: 300, height: 150, imageCropMode: ImageCropMode.Max); + var urlStringStretch = mediaPath.GetCropUrl(imageCropperValue: cropperJson1, width: 300, height: 150, imageCropMode: ImageCropMode.Stretch); + + Assert.AreEqual(mediaPath + "?mode=min&width=300&height=150", urlStringMin); + Assert.AreEqual(mediaPath + "?mode=boxpad&width=300&height=150", urlStringBoxPad); + Assert.AreEqual(mediaPath + "?mode=pad&width=300&height=150", urlStringPad); + Assert.AreEqual(mediaPath + "?mode=max&width=300&height=150", urlStringMax); + Assert.AreEqual(mediaPath + "?mode=stretch&width=300&height=150", urlStringStretch); } /// diff --git a/src/Umbraco.Web/Models/ImageCropAnchor.cs b/src/Umbraco.Web/Models/ImageCropAnchor.cs index edf2853fcf..94e666e5ea 100644 --- a/src/Umbraco.Web/Models/ImageCropAnchor.cs +++ b/src/Umbraco.Web/Models/ImageCropAnchor.cs @@ -6,6 +6,10 @@ Top, Right, Bottom, - Left + Left, + TopLeft, + TopRight, + BottomLeft, + BottomRight } } \ No newline at end of file diff --git a/src/Umbraco.Web/Models/ImageCropMode.cs b/src/Umbraco.Web/Models/ImageCropMode.cs index d3b620a3a4..e36f079c02 100644 --- a/src/Umbraco.Web/Models/ImageCropMode.cs +++ b/src/Umbraco.Web/Models/ImageCropMode.cs @@ -5,6 +5,8 @@ namespace Umbraco.Web.Models Crop, Max, Stretch, - Pad + Pad, + BoxPad, + Min } }