From 8babf2b38058a458b2ab9c62858b728059aef548 Mon Sep 17 00:00:00 2001 From: Doug Bunting Date: Sat, 22 Aug 2015 15:32:02 -0700 Subject: [PATCH] Change in-box tag helpers to use `DefaultFrameworkSortOrder` - #2905 - override `Order` implementation inherited from `TagHelper` - only exception is `UrlResolutionTagHelper` which already overrides `Order` to execute much earlier --- .../AnchorTagHelper.cs | 9 +++++++++ .../CacheTagHelper.cs | 9 +++++++++ .../EnvironmentTagHelper.cs | 9 +++++++++ .../FormTagHelper.cs | 9 +++++++++ .../ImageTagHelper.cs | 9 +++++++++ .../InputTagHelper.cs | 9 +++++++++ .../LabelTagHelper.cs | 9 +++++++++ .../LinkTagHelper.cs | 9 +++++++++ .../OptionTagHelper.cs | 13 +++++++++++-- .../ScriptTagHelper.cs | 9 +++++++++ .../SelectTagHelper.cs | 9 +++++++++ .../TextAreaTagHelper.cs | 9 +++++++++ .../ValidationMessageTagHelper.cs | 9 +++++++++ .../ValidationSummaryTagHelper.cs | 9 +++++++++ 14 files changed, 128 insertions(+), 2 deletions(-) diff --git a/src/Microsoft.AspNet.Mvc.TagHelpers/AnchorTagHelper.cs b/src/Microsoft.AspNet.Mvc.TagHelpers/AnchorTagHelper.cs index d25a6949fe..6c5a848545 100644 --- a/src/Microsoft.AspNet.Mvc.TagHelpers/AnchorTagHelper.cs +++ b/src/Microsoft.AspNet.Mvc.TagHelpers/AnchorTagHelper.cs @@ -41,6 +41,15 @@ namespace Microsoft.AspNet.Mvc.TagHelpers Generator = generator; } + /// + public override int Order + { + get + { + return DefaultOrder.DefaultFrameworkSortOrder; + } + } + protected IHtmlGenerator Generator { get; } /// diff --git a/src/Microsoft.AspNet.Mvc.TagHelpers/CacheTagHelper.cs b/src/Microsoft.AspNet.Mvc.TagHelpers/CacheTagHelper.cs index 1394d250ba..6b1d0b3879 100644 --- a/src/Microsoft.AspNet.Mvc.TagHelpers/CacheTagHelper.cs +++ b/src/Microsoft.AspNet.Mvc.TagHelpers/CacheTagHelper.cs @@ -45,6 +45,15 @@ namespace Microsoft.AspNet.Mvc.TagHelpers MemoryCache = memoryCache; } + /// + public override int Order + { + get + { + return DefaultOrder.DefaultFrameworkSortOrder; + } + } + /// /// Gets the instance used to cache entries. /// diff --git a/src/Microsoft.AspNet.Mvc.TagHelpers/EnvironmentTagHelper.cs b/src/Microsoft.AspNet.Mvc.TagHelpers/EnvironmentTagHelper.cs index c2b8450ec2..622c36c12a 100644 --- a/src/Microsoft.AspNet.Mvc.TagHelpers/EnvironmentTagHelper.cs +++ b/src/Microsoft.AspNet.Mvc.TagHelpers/EnvironmentTagHelper.cs @@ -25,6 +25,15 @@ namespace Microsoft.AspNet.Mvc.TagHelpers HostingEnvironment = hostingEnvironment; } + /// + public override int Order + { + get + { + return DefaultOrder.DefaultFrameworkSortOrder; + } + } + /// /// A comma separated list of environment names in which the content should be rendered. /// diff --git a/src/Microsoft.AspNet.Mvc.TagHelpers/FormTagHelper.cs b/src/Microsoft.AspNet.Mvc.TagHelpers/FormTagHelper.cs index 8a48675a4d..b04b8fa85d 100644 --- a/src/Microsoft.AspNet.Mvc.TagHelpers/FormTagHelper.cs +++ b/src/Microsoft.AspNet.Mvc.TagHelpers/FormTagHelper.cs @@ -37,6 +37,15 @@ namespace Microsoft.AspNet.Mvc.TagHelpers Generator = generator; } + /// + public override int Order + { + get + { + return DefaultOrder.DefaultFrameworkSortOrder; + } + } + [HtmlAttributeNotBound] [ViewContext] public ViewContext ViewContext { get; set; } diff --git a/src/Microsoft.AspNet.Mvc.TagHelpers/ImageTagHelper.cs b/src/Microsoft.AspNet.Mvc.TagHelpers/ImageTagHelper.cs index 3133a360ce..873252ca0f 100644 --- a/src/Microsoft.AspNet.Mvc.TagHelpers/ImageTagHelper.cs +++ b/src/Microsoft.AspNet.Mvc.TagHelpers/ImageTagHelper.cs @@ -46,6 +46,15 @@ namespace Microsoft.AspNet.Mvc.TagHelpers Cache = cache; } + /// + public override int Order + { + get + { + return DefaultOrder.DefaultFrameworkSortOrder; + } + } + /// /// Source of the image. /// diff --git a/src/Microsoft.AspNet.Mvc.TagHelpers/InputTagHelper.cs b/src/Microsoft.AspNet.Mvc.TagHelpers/InputTagHelper.cs index e0c39ac497..71a20900ef 100644 --- a/src/Microsoft.AspNet.Mvc.TagHelpers/InputTagHelper.cs +++ b/src/Microsoft.AspNet.Mvc.TagHelpers/InputTagHelper.cs @@ -71,6 +71,15 @@ namespace Microsoft.AspNet.Mvc.TagHelpers Generator = generator; } + /// + public override int Order + { + get + { + return DefaultOrder.DefaultFrameworkSortOrder; + } + } + protected IHtmlGenerator Generator { get; } [HtmlAttributeNotBound] diff --git a/src/Microsoft.AspNet.Mvc.TagHelpers/LabelTagHelper.cs b/src/Microsoft.AspNet.Mvc.TagHelpers/LabelTagHelper.cs index 5ce55c5e29..6c8c71e7e3 100644 --- a/src/Microsoft.AspNet.Mvc.TagHelpers/LabelTagHelper.cs +++ b/src/Microsoft.AspNet.Mvc.TagHelpers/LabelTagHelper.cs @@ -24,6 +24,15 @@ namespace Microsoft.AspNet.Mvc.TagHelpers Generator = generator; } + /// + public override int Order + { + get + { + return DefaultOrder.DefaultFrameworkSortOrder; + } + } + [HtmlAttributeNotBound] [ViewContext] public ViewContext ViewContext { get; set; } diff --git a/src/Microsoft.AspNet.Mvc.TagHelpers/LinkTagHelper.cs b/src/Microsoft.AspNet.Mvc.TagHelpers/LinkTagHelper.cs index ecd0365d2e..da224795ef 100644 --- a/src/Microsoft.AspNet.Mvc.TagHelpers/LinkTagHelper.cs +++ b/src/Microsoft.AspNet.Mvc.TagHelpers/LinkTagHelper.cs @@ -107,6 +107,15 @@ namespace Microsoft.AspNet.Mvc.TagHelpers JavaScriptEncoder = javaScriptEncoder; } + /// + public override int Order + { + get + { + return DefaultOrder.DefaultFrameworkSortOrder; + } + } + /// /// Address of the linked resource. /// diff --git a/src/Microsoft.AspNet.Mvc.TagHelpers/OptionTagHelper.cs b/src/Microsoft.AspNet.Mvc.TagHelpers/OptionTagHelper.cs index 53d24ef921..1578ac9583 100644 --- a/src/Microsoft.AspNet.Mvc.TagHelpers/OptionTagHelper.cs +++ b/src/Microsoft.AspNet.Mvc.TagHelpers/OptionTagHelper.cs @@ -13,8 +13,8 @@ namespace Microsoft.AspNet.Mvc.TagHelpers /// implementation targeting <option> elements. /// /// - /// This works in conjunction with . It reads elements - /// content but does not modify that content. The only modification it makes is to add a selected attribute + /// This works in conjunction with . It reads elements + /// content but does not modify that content. The only modification it makes is to add a selected attribute /// in some cases. /// public class OptionTagHelper : TagHelper @@ -28,6 +28,15 @@ namespace Microsoft.AspNet.Mvc.TagHelpers Generator = generator; } + /// + public override int Order + { + get + { + return DefaultOrder.DefaultFrameworkSortOrder; + } + } + protected IHtmlGenerator Generator { get; } [HtmlAttributeNotBound] diff --git a/src/Microsoft.AspNet.Mvc.TagHelpers/ScriptTagHelper.cs b/src/Microsoft.AspNet.Mvc.TagHelpers/ScriptTagHelper.cs index 76cda41b99..3b678d07c1 100644 --- a/src/Microsoft.AspNet.Mvc.TagHelpers/ScriptTagHelper.cs +++ b/src/Microsoft.AspNet.Mvc.TagHelpers/ScriptTagHelper.cs @@ -93,6 +93,15 @@ namespace Microsoft.AspNet.Mvc.TagHelpers JavaScriptEncoder = javaScriptEncoder; } + /// + public override int Order + { + get + { + return DefaultOrder.DefaultFrameworkSortOrder; + } + } + /// /// Address of the external script to use. /// diff --git a/src/Microsoft.AspNet.Mvc.TagHelpers/SelectTagHelper.cs b/src/Microsoft.AspNet.Mvc.TagHelpers/SelectTagHelper.cs index 4493fc16b5..2ca52be545 100644 --- a/src/Microsoft.AspNet.Mvc.TagHelpers/SelectTagHelper.cs +++ b/src/Microsoft.AspNet.Mvc.TagHelpers/SelectTagHelper.cs @@ -40,6 +40,15 @@ namespace Microsoft.AspNet.Mvc.TagHelpers Generator = generator; } + /// + public override int Order + { + get + { + return DefaultOrder.DefaultFrameworkSortOrder; + } + } + protected IHtmlGenerator Generator { get; } [HtmlAttributeNotBound] diff --git a/src/Microsoft.AspNet.Mvc.TagHelpers/TextAreaTagHelper.cs b/src/Microsoft.AspNet.Mvc.TagHelpers/TextAreaTagHelper.cs index e04aa30c04..a25b467b95 100644 --- a/src/Microsoft.AspNet.Mvc.TagHelpers/TextAreaTagHelper.cs +++ b/src/Microsoft.AspNet.Mvc.TagHelpers/TextAreaTagHelper.cs @@ -23,6 +23,15 @@ namespace Microsoft.AspNet.Mvc.TagHelpers Generator = generator; } + /// + public override int Order + { + get + { + return DefaultOrder.DefaultFrameworkSortOrder; + } + } + protected IHtmlGenerator Generator { get; } [HtmlAttributeNotBound] diff --git a/src/Microsoft.AspNet.Mvc.TagHelpers/ValidationMessageTagHelper.cs b/src/Microsoft.AspNet.Mvc.TagHelpers/ValidationMessageTagHelper.cs index e7e537266d..502734373b 100644 --- a/src/Microsoft.AspNet.Mvc.TagHelpers/ValidationMessageTagHelper.cs +++ b/src/Microsoft.AspNet.Mvc.TagHelpers/ValidationMessageTagHelper.cs @@ -25,6 +25,15 @@ namespace Microsoft.AspNet.Mvc.TagHelpers Generator = generator; } + /// + public override int Order + { + get + { + return DefaultOrder.DefaultFrameworkSortOrder; + } + } + [HtmlAttributeNotBound] [ViewContext] public ViewContext ViewContext { get; set; } diff --git a/src/Microsoft.AspNet.Mvc.TagHelpers/ValidationSummaryTagHelper.cs b/src/Microsoft.AspNet.Mvc.TagHelpers/ValidationSummaryTagHelper.cs index ed94593b83..7bb89a5a87 100644 --- a/src/Microsoft.AspNet.Mvc.TagHelpers/ValidationSummaryTagHelper.cs +++ b/src/Microsoft.AspNet.Mvc.TagHelpers/ValidationSummaryTagHelper.cs @@ -26,6 +26,15 @@ namespace Microsoft.AspNet.Mvc.TagHelpers Generator = generator; } + /// + public override int Order + { + get + { + return DefaultOrder.DefaultFrameworkSortOrder; + } + } + [HtmlAttributeNotBound] [ViewContext] public ViewContext ViewContext { get; set; }