Add GetCropUrl overloads accepting MediaWithCrops on UrlHelper

Author: ronaldbarendse

src/Umbraco.Web/UrlHelperRenderExtensions.cs

@@ -4,6 +4,7 @@
 using System.Web;
 using System.Web.Mvc;
 using Umbraco.Core;
+using Umbraco.Core.Models;
 using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Core.PropertyEditors.ValueConverters;
 using Umbraco.Web.Composing;
@@ -17,9 +18,10 @@ namespace Umbraco.Web
     /// </summary>
     public static class UrlHelperRenderExtensions
     {
-
         private static readonly IHtmlString EmptyHtmlString = new HtmlString(string.Empty);
 
+        private static IHtmlString CreateHtmlString(string value, bool htmlEncode) => htmlEncode ? new HtmlString(HttpUtility.HtmlEncode(value)) : new HtmlString(value);
+
         #region GetCropUrl
 
         /// <summary>
@@ -42,7 +44,17 @@ public static IHtmlString GetCropUrl(this UrlHelper urlHelper, IPublishedContent
             if (mediaItem == null) return EmptyHtmlString;
 
             var url = mediaItem.GetCropUrl(cropAlias: cropAlias, useCropDimensions: true);
-            return htmlEncode ? new HtmlString(HttpUtility.HtmlEncode(url)) : new HtmlString(url);
+
+            return CreateHtmlString(url, htmlEncode);
+        }
+
+        public static IHtmlString GetCropUrl(this UrlHelper urlHelper, MediaWithCrops mediaWithCrops, string cropAlias, bool htmlEncode = true)
+        {
+            if (mediaWithCrops == null) return EmptyHtmlString;
+
+            var url = mediaWithCrops.GetCropUrl(cropAlias: cropAlias, useCropDimensions: true);
+
+            return CreateHtmlString(url, htmlEncode);
         }
 
         /// <summary>
@@ -70,7 +82,17 @@ public static IHtmlString GetCropUrl(this UrlHelper urlHelper, IPublishedContent
             if (mediaItem == null) return EmptyHtmlString;
 
             var url = mediaItem.GetCropUrl(propertyAlias: propertyAlias, cropAlias: cropAlias, useCropDimensions: true);
-            return htmlEncode ? new HtmlString(HttpUtility.HtmlEncode(url)) : new HtmlString(url);
+
+            return CreateHtmlString(url, htmlEncode);
+        }
+
+        public static IHtmlString GetCropUrl(this UrlHelper urlHelper, MediaWithCrops mediaWithCrops, string propertyAlias, string cropAlias, bool htmlEncode = true)
+        {
+            if (mediaWithCrops == null) return EmptyHtmlString;
+
+            var url = mediaWithCrops.GetCropUrl(propertyAlias: propertyAlias, cropAlias: cropAlias, useCropDimensions: true);
+
+            return CreateHtmlString(url, htmlEncode);
         }
 
         /// <summary>
@@ -150,10 +172,33 @@ public static IHtmlString GetCropUrl(this UrlHelper urlHelper,
         {
             if (mediaItem == null) return EmptyHtmlString;
 
-            var url = mediaItem.GetCropUrl(width, height, propertyAlias, cropAlias, quality, imageCropMode,
-                imageCropAnchor, preferFocalPoint, useCropDimensions, cacheBuster, furtherOptions, ratioMode,
-                upScale);
-            return htmlEncode ? new HtmlString(HttpUtility.HtmlEncode(url)) : new HtmlString(url);
+            var url = mediaItem.GetCropUrl(width, height, propertyAlias, cropAlias, quality, imageCropMode, imageCropAnchor, preferFocalPoint, useCropDimensions, cacheBuster, furtherOptions, ratioMode, upScale);
+
+            return CreateHtmlString(url, htmlEncode);
+        }
+
+        public static IHtmlString GetCropUrl(this UrlHelper urlHelper,
+            MediaWithCrops mediaWithCrops,
+            int? width = null,
+            int? height = null,
+            string propertyAlias = Umbraco.Core.Constants.Conventions.Media.File,
+            string cropAlias = null,
+            int? quality = null,
+            ImageCropMode? imageCropMode = null,
+            ImageCropAnchor? imageCropAnchor = null,
+            bool preferFocalPoint = false,
+            bool useCropDimensions = false,
+            bool cacheBuster = true,
+            string furtherOptions = null,
+            ImageCropRatioMode? ratioMode = null,
+            bool upScale = true,
+            bool htmlEncode = true)
+        {
+            if (mediaWithCrops == null) return EmptyHtmlString;
+
+            var url = mediaWithCrops.GetCropUrl(width, height, propertyAlias, cropAlias, quality, imageCropMode, imageCropAnchor, preferFocalPoint, useCropDimensions, cacheBuster, furtherOptions, ratioMode, upScale);
+
+            return CreateHtmlString(url, htmlEncode);
         }
 
         /// <summary>
@@ -231,18 +276,18 @@ public static IHtmlString GetCropUrl(this UrlHelper urlHelper,
             bool upScale = true,
             bool htmlEncode = true)
         {
-            var url = imageUrl.GetCropUrl(width, height, imageCropperValue, cropAlias, quality, imageCropMode,
-                imageCropAnchor, preferFocalPoint, useCropDimensions, cacheBusterValue, furtherOptions, ratioMode,
-                upScale);
-            return htmlEncode ? new HtmlString(HttpUtility.HtmlEncode(url)) : new HtmlString(url);
+            var url = imageUrl.GetCropUrl(width, height, imageCropperValue, cropAlias, quality, imageCropMode, imageCropAnchor, preferFocalPoint, useCropDimensions, cacheBusterValue, furtherOptions, ratioMode, upScale);
+
+            return CreateHtmlString(url, htmlEncode);
         }
 
         public static IHtmlString GetCropUrl(this UrlHelper urlHelper, ImageCropperValue imageCropperValue, string cropAlias, bool htmlEncode = true)
         {
             if (imageCropperValue == null) return EmptyHtmlString;
 
             var url = imageCropperValue.Src.GetCropUrl(imageCropperValue, cropAlias: cropAlias, useCropDimensions: true);
-            return htmlEncode ? new HtmlString(HttpUtility.HtmlEncode(url)) : new HtmlString(url);
+
+            return CreateHtmlString(url, htmlEncode);
         }
 
         public static IHtmlString GetCropUrl(this UrlHelper urlHelper,
@@ -263,11 +308,9 @@ public static IHtmlString GetCropUrl(this UrlHelper urlHelper,
         {
             if (imageCropperValue == null) return EmptyHtmlString;
 
-            var imageUrl = imageCropperValue.Src;
-            var url = imageUrl.GetCropUrl(imageCropperValue, width, height, cropAlias, quality, imageCropMode,
-                imageCropAnchor, preferFocalPoint, useCropDimensions, cacheBusterValue, furtherOptions, ratioMode,
-                upScale);
-            return htmlEncode ? new HtmlString(HttpUtility.HtmlEncode(url)) : new HtmlString(url);
+            var url = imageCropperValue.Src.GetCropUrl(imageCropperValue, width, height, cropAlias, quality, imageCropMode, imageCropAnchor, preferFocalPoint, useCropDimensions, cacheBusterValue, furtherOptions, ratioMode, upScale);
+
+            return CreateHtmlString(url, htmlEncode);
         }
 
         #endregion