From b37197f66aa4ae86ee7fba0393b38a41e96c347f Mon Sep 17 00:00:00 2001 From: Matt Wanchap Date: Thu, 22 Feb 2018 11:46:23 +1000 Subject: [PATCH 1/3] Fix for U4-10821, render alt text attribute from grid image editor, or empty string if null (for screen readers) --- src/Umbraco.Web.UI/Views/Partials/Grid/Editors/Media.cshtml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI/Views/Partials/Grid/Editors/Media.cshtml b/src/Umbraco.Web.UI/Views/Partials/Grid/Editors/Media.cshtml index 09d04219f2..9d29b378b0 100644 --- a/src/Umbraco.Web.UI/Views/Partials/Grid/Editors/Media.cshtml +++ b/src/Umbraco.Web.UI/Views/Partials/Grid/Editors/Media.cshtml @@ -13,8 +13,10 @@ url += "&mode=crop"; } } + + var altText = Model.value.altText ?? String.Empty; - @Model.value.caption + @altText if (Model.value.caption != null) { From da0a1c808a1ef154234d1e79ff0ee35059163b84 Mon Sep 17 00:00:00 2001 From: Matt Wanchap Date: Wed, 28 Feb 2018 11:06:59 +1000 Subject: [PATCH 2/3] Added fallback to caption if no altText, as suggested --- src/Umbraco.Web.UI/Views/Partials/Grid/Editors/Media.cshtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI/Views/Partials/Grid/Editors/Media.cshtml b/src/Umbraco.Web.UI/Views/Partials/Grid/Editors/Media.cshtml index 9d29b378b0..f821d13f47 100644 --- a/src/Umbraco.Web.UI/Views/Partials/Grid/Editors/Media.cshtml +++ b/src/Umbraco.Web.UI/Views/Partials/Grid/Editors/Media.cshtml @@ -14,7 +14,7 @@ } } - var altText = Model.value.altText ?? String.Empty; + var altText = Model.value.altText ?? Model.value.caption ?? String.Empty; @altText From b9ee85dabcfae847598deb52d2dceac722a6a810 Mon Sep 17 00:00:00 2001 From: Robert Date: Mon, 5 Mar 2018 14:34:36 +0100 Subject: [PATCH 3/3] String ->string --- src/Umbraco.Web.UI/Views/Partials/Grid/Editors/Media.cshtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI/Views/Partials/Grid/Editors/Media.cshtml b/src/Umbraco.Web.UI/Views/Partials/Grid/Editors/Media.cshtml index f821d13f47..ea79ce41ad 100644 --- a/src/Umbraco.Web.UI/Views/Partials/Grid/Editors/Media.cshtml +++ b/src/Umbraco.Web.UI/Views/Partials/Grid/Editors/Media.cshtml @@ -14,7 +14,7 @@ } } - var altText = Model.value.altText ?? Model.value.caption ?? String.Empty; + var altText = Model.value.altText ?? Model.value.caption ?? string.Empty; @altText