Merge branch 'richarth-img-helper-alt-fix'

Warren Buckley · Warren Buckley · commit c5880038a828 · 2023-05-05T13:06:04.000+01:00
diff --git a/Our.Umbraco.TagHelpers/ImgTagHelper.cs b/Our.Umbraco.TagHelpers/ImgTagHelper.cs
@@ -180,12 +180,17 @@ public override void Process(TagHelperContext context, TagHelperOutput output)
                     height = (originalHeight / originalWidth) * width;
                 }
 
-                #region Autogenerate alt text
+                #region Autogenerate alt text if unspecfied
                 if (string.IsNullOrWhiteSpace(ImgAlt))
                 {
                     output.Attributes.Add("alt", GetImageAltText(MediaItem));
                 }
+                else
+                {
+                    output.Attributes.Add("alt", ImgAlt);
+                }
                 #endregion
+                
                 #endregion
             }
             else if (!string.IsNullOrEmpty(FileSource))
@@ -196,11 +201,15 @@ public override void Process(TagHelperContext context, TagHelperOutput output)
 
                 imgSrc = AddQueryToUrl(FileSource, "width", width.ToString());
 
-                #region Autogenerate alt text
+                #region Autogenerate alt text if unspecfied
                 if (string.IsNullOrWhiteSpace(ImgAlt))
                 {
                     output.Attributes.Add("alt", GetImageAltText(FileSource));
                 }
+                else
+                {
+                    output.Attributes.Add("alt", ImgAlt);
+                }
                 #endregion
 
                 #region If width & height are not defined then return a basic <img> with just a src, alt & class (if provided)

Original file line number	Diff line number	Diff line change
`@@ -180,12 +180,17 @@ public override void Process(TagHelperContext context, TagHelperOutput output)`
`180`	`180`	`height = (originalHeight / originalWidth) * width;`
`181`	`181`	`}`
`182`	`182`
`183`		`- #region Autogenerate alt text`
	`183`	`+ #region Autogenerate alt text if unspecfied`
`184`	`184`	`if (string.IsNullOrWhiteSpace(ImgAlt))`
`185`	`185`	`{`
`186`	`186`	`output.Attributes.Add("alt", GetImageAltText(MediaItem));`
`187`	`187`	`}`
	`188`	`+ else`
	`189`	`+ {`
	`190`	`+ output.Attributes.Add("alt", ImgAlt);`
	`191`	`+ }`
`188`	`192`	`#endregion`
	`193`	`+`
`189`	`194`	`#endregion`
`190`	`195`	`}`
`191`	`196`	`else if (!string.IsNullOrEmpty(FileSource))`
`@@ -196,11 +201,15 @@ public override void Process(TagHelperContext context, TagHelperOutput output)`
`196`	`201`
`197`	`202`	`imgSrc = AddQueryToUrl(FileSource, "width", width.ToString());`
`198`	`203`
`199`		`- #region Autogenerate alt text`
	`204`	`+ #region Autogenerate alt text if unspecfied`
`200`	`205`	`if (string.IsNullOrWhiteSpace(ImgAlt))`
`201`	`206`	`{`
`202`	`207`	`output.Attributes.Add("alt", GetImageAltText(FileSource));`
`203`	`208`	`}`
	`209`	`+ else`
	`210`	`+ {`
	`211`	`+ output.Attributes.Add("alt", ImgAlt);`
	`212`	`+ }`
`204`	`213`	`#endregion`
`205`	`214`
`206`	`215`	`#region If width & height are not defined then return a basic <img> with just a src, alt & class (if provided)`