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

Merge branch origin/dev-v7.6 into dev-v7-deploy

Browse Source
This commit is contained in:
Stephan
2016-09-12 14:06:58 +02:00
parent 3f65ec3318 6cccf84043
commit d84cfe001f
3 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/Umbraco.Tests/PropertyEditors/ImageCropperTest.cs
View File

@@ -261,8 +261,17 @@ namespace Umbraco.Tests.PropertyEditors
[Test] [Test]
public void GetCropUrl_SpecifiedCropModeTest() public void GetCropUrl_SpecifiedCropModeTest()
{ {
var urlString = mediaPath.GetCropUrl(imageCropperValue: cropperJson1, width: 300, height: 150, imageCropMode:ImageCropMode.Max); var urlStringMin = mediaPath.GetCropUrl(imageCropperValue: cropperJson1, width: 300, height: 150, imageCropMode: ImageCropMode.Min);
Assert.AreEqual(mediaPath + "?mode=max&width=300&height=150", urlString); 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);
} }
/// <summary> /// <summary>

6
src/Umbraco.Web/Models/ImageCropAnchor.cs
View File

@@ -6,6 +6,10 @@
Top, Top,
Right, Right,
Bottom, Bottom,
Left Left,
TopLeft,
TopRight,
BottomLeft,
BottomRight
} }
} }

4
src/Umbraco.Web/Models/ImageCropMode.cs
View File

@@ -5,6 +5,8 @@ namespace Umbraco.Web.Models
Crop, Crop,
Max, Max,
Stretch, Stretch,
Pad Pad,
BoxPad,
Min
} }
} }