Remove IHtmlHelper extension and prepare TagHelper - MetaDescription

grandnode · Aug 7, 2020 · b5852a4 · b5852a4
1 parent d461b88
commit b5852a4
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 25 deletions.
diff --git a/Grand.Framework/TagHelpers/MetaDescriptionTagHelper.cs b/Grand.Framework/TagHelpers/MetaDescriptionTagHelper.cs
@@ -0,0 +1,27 @@
+using Grand.Framework.UI;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using System.Threading.Tasks;
+
+namespace Grand.Framework.TagHelpers
+{
+    [HtmlTargetElement("meta-description", TagStructure = TagStructure.WithoutEndTag)]
+    public class MetaDescriptionTagHelper : TagHelper
+    {
+
+        private readonly IPageHeadBuilder _pageHeadBuilder;
+
+        public MetaDescriptionTagHelper(IPageHeadBuilder pageHeadBuilder)
+        {
+            _pageHeadBuilder = pageHeadBuilder;
+        }
+
+        public override Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
+        {
+            output.TagName = "meta";
+            output.Attributes.Add("name", "description");
+            output.Attributes.Add("content", _pageHeadBuilder.GenerateMetaDescription());
+            return Task.CompletedTask;
+        }
+
+    }
+}
diff --git a/Grand.Framework/UI/LayoutExtensions.cs b/Grand.Framework/UI/LayoutExtensions.cs
@@ -31,29 +31,6 @@ public static void AddMetaDescriptionParts(this IHtmlHelper html, string part)
             var pageHeadBuilder = html.ViewContext.HttpContext.RequestServices.GetRequiredService<IPageHeadBuilder>();
             pageHeadBuilder.AddMetaDescriptionParts(part);
         }
-        /// <summary>
-        /// Append meta description element to the <![CDATA[<head>]]>
-        /// </summary>
-        /// <param name="html">HTML helper</param>
-        /// <param name="part">Meta description part</param>
-        public static void AppendMetaDescriptionParts(this IHtmlHelper html, string part)
-        {
-            var pageHeadBuilder = html.ViewContext.HttpContext.RequestServices.GetRequiredService<IPageHeadBuilder>();
-            pageHeadBuilder.AppendMetaDescriptionParts(part);
-        }
-        /// <summary>
-        /// Generate all description parts
-        /// </summary>
-        /// <param name="html">HTML helper</param>
-        /// <param name="part">Meta description part</param>
-        /// <returns>Generated string</returns>
-        public static IHtmlContent GrandMetaDescription(this IHtmlHelper html, string part = "")
-        {
-            var pageHeadBuilder = html.ViewContext.HttpContext.RequestServices.GetRequiredService<IPageHeadBuilder>();
-            html.AppendMetaDescriptionParts(part);
-            return new HtmlString(html.Encode(pageHeadBuilder.GenerateMetaDescription()));
-        }
-
 
         /// <summary>
         /// Add meta keyword element to the <![CDATA[<head>]]>

diff --git a/Grand.Web/Views/Shared/_Root.Head.cshtml b/Grand.Web/Views/Shared/_Root.Head.cshtml
@@ -19,7 +19,7 @@
 <head>
     <title asp-default-title="true"></title>
     <meta charset="utf-8">
-    <meta name="description" content="@(Html.GrandMetaDescription())">
+    <meta-description>
     <meta name="keywords" content="@(Html.GrandMetaKeywords())">
     <meta name="generator" content="grandnode">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, shrink-to-fit=no">

diff --git a/Grand.Web/Views/Shared/_RootPopup.cshtml b/Grand.Web/Views/Shared/_RootPopup.cshtml
@@ -3,7 +3,7 @@
 <head>
     <title asp-default-title="true"></title>
     <meta http-equiv="Content-type" content="text/html;charset=UTF-8" />
-    <meta name="description" content="@(Html.GrandMetaDescription())" />
+    <meta-description>
     <meta name="keywords" content="@(Html.GrandMetaKeywords())" />
     @Html.GrandHeadCustom()
     @*This is used so that themes can inject content into the header*@