diff --git a/src/Microsoft.AspNet.Mvc.Core/Rendering/HtmlHelperInputExtensions.cs b/src/Microsoft.AspNet.Mvc.Core/Rendering/HtmlHelperInputExtensions.cs index e9d9404109..05ea4e1825 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Rendering/HtmlHelperInputExtensions.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Rendering/HtmlHelperInputExtensions.cs @@ -107,7 +107,7 @@ namespace Microsoft.AspNet.Mvc.Rendering public static HtmlString TextBox([NotNull] this IHtmlHelper htmlHelper, string name) { - return TextBox(htmlHelper, name, value: null); + return htmlHelper.TextBox(name, value: null, format: null, htmlAttributes: null); } public static HtmlString TextBox( @@ -115,7 +115,7 @@ namespace Microsoft.AspNet.Mvc.Rendering string name, object value) { - return TextBox(htmlHelper, name, value, format: null); + return htmlHelper.TextBox(name, value, format: null, htmlAttributes: null); } public static HtmlString TextBox( @@ -124,7 +124,7 @@ namespace Microsoft.AspNet.Mvc.Rendering object value, string format) { - return TextBox(htmlHelper, name, value, format, htmlAttributes: null); + return htmlHelper.TextBox(name, value, format, htmlAttributes: null); } public static HtmlString TextBox( @@ -133,41 +133,25 @@ namespace Microsoft.AspNet.Mvc.Rendering object value, object htmlAttributes) { - return TextBox(htmlHelper, name, value, format: null, htmlAttributes: htmlAttributes); - } - - public static HtmlString TextBox( - [NotNull] this IHtmlHelper htmlHelper, - string name, - object value, - string format, - object htmlAttributes) - { - return htmlHelper.TextBox(name, value, format, htmlAttributes); + return htmlHelper.TextBox(name, value, format: null, htmlAttributes: htmlAttributes); } public static HtmlString TextBoxFor([NotNull] this IHtmlHelper htmlHelper, [NotNull] Expression> expression) { - return TextBoxFor(htmlHelper, expression, format: null); + return htmlHelper.TextBoxFor(expression, format: null, htmlAttributes: null); } public static HtmlString TextBoxFor([NotNull] this IHtmlHelper htmlHelper, [NotNull] Expression> expression, string format) { - return TextBoxFor(htmlHelper, expression, format, htmlAttributes: null); + return htmlHelper.TextBoxFor(expression, format, htmlAttributes: null); } public static HtmlString TextBoxFor([NotNull] this IHtmlHelper htmlHelper, [NotNull] Expression> expression, object htmlAttributes) { - return TextBoxFor(htmlHelper, expression, format: null, htmlAttributes: htmlAttributes); - } - - public static HtmlString TextBoxFor([NotNull] this IHtmlHelper htmlHelper, - [NotNull] Expression> expression, string format, object htmlAttributes) - { - return htmlHelper.TextBoxFor(expression, format: format, htmlAttributes: htmlAttributes); + return htmlHelper.TextBoxFor(expression, format: null, htmlAttributes: htmlAttributes); } public static HtmlString TextArea([NotNull] this IHtmlHelper htmlHelper, @@ -194,12 +178,6 @@ namespace Microsoft.AspNet.Mvc.Rendering return htmlHelper.TextArea(name, value, rows: 0, columns: 0, htmlAttributes: htmlAttributes); } - public static HtmlString TextArea([NotNull] this IHtmlHelper htmlHelper, - string name, string value, int rows, int columns, object htmlAttributes) - { - return htmlHelper.TextArea(name, value, rows, columns, htmlAttributes); - } - public static HtmlString TextAreaFor([NotNull] this IHtmlHelper htmlHelper, [NotNull] Expression> expression) { @@ -211,11 +189,5 @@ namespace Microsoft.AspNet.Mvc.Rendering { return htmlHelper.TextAreaFor(expression, rows: 0, columns: 0, htmlAttributes: htmlAttributes); } - - public static HtmlString TextAreaFor([NotNull] this IHtmlHelper htmlHelper, - [NotNull] Expression> expression, int rows, int columns, object htmlAttributes) - { - return htmlHelper.TextAreaFor(expression, rows, columns, htmlAttributes); - } } } diff --git a/src/Microsoft.AspNet.Mvc.Core/Rendering/HtmlHelperLabelExtensions.cs b/src/Microsoft.AspNet.Mvc.Core/Rendering/HtmlHelperLabelExtensions.cs index a54cf52511..e954be8553 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Rendering/HtmlHelperLabelExtensions.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Rendering/HtmlHelperLabelExtensions.cs @@ -42,7 +42,7 @@ namespace Microsoft.AspNet.Mvc.Rendering public static HtmlString LabelForModel([NotNull] this IHtmlHelper html) { - return LabelForModel(html, labelText: null); + return html.Label(expression: null, labelText: null, htmlAttributes: null); } public static HtmlString LabelForModel([NotNull] this IHtmlHelper html, string labelText) diff --git a/src/Microsoft.AspNet.Mvc.Core/Rendering/HtmlHelperLinkExtensions.cs b/src/Microsoft.AspNet.Mvc.Core/Rendering/HtmlHelperLinkExtensions.cs index f5317ce5c8..e1b9174ef2 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Rendering/HtmlHelperLinkExtensions.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Rendering/HtmlHelperLinkExtensions.cs @@ -188,25 +188,5 @@ namespace Microsoft.AspNet.Mvc.Rendering routeValues: routeValues, htmlAttributes: htmlAttributes); } - - public static HtmlString RouteLink( - [NotNull] this IHtmlHelper htmlHelper, - [NotNull] string linkText, - string routeName, - string protocol, - string hostName, - string fragment, - object routeValues, - object htmlAttributes) - { - return htmlHelper.RouteLink( - linkText, - routeName, - protocol, - hostName, - fragment, - routeValues, - htmlAttributes); - } } } diff --git a/src/Microsoft.AspNet.Mvc.Core/Rendering/HtmlHelperValidationExtensions.cs b/src/Microsoft.AspNet.Mvc.Core/Rendering/HtmlHelperValidationExtensions.cs index f8a02496f8..5da8962d1d 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Rendering/HtmlHelperValidationExtensions.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Rendering/HtmlHelperValidationExtensions.cs @@ -44,15 +44,6 @@ namespace Microsoft.AspNet.Mvc.Rendering return htmlHelper.ValidationMessage(expression, message, htmlAttributes, tag: null); } - public static HtmlString ValidationMessage([NotNull] this IHtmlHelper htmlHelper, - string expression, - string message, - object htmlAttributes, - string tag) - { - return htmlHelper.ValidationMessage(expression, message, htmlAttributes, tag); - } - public static HtmlString ValidationMessageFor([NotNull] this IHtmlHelper htmlHelper, [NotNull] Expression> expression) { @@ -82,15 +73,6 @@ namespace Microsoft.AspNet.Mvc.Rendering return htmlHelper.ValidationMessageFor(expression, message, htmlAttributes: null, tag: tag); } - public static HtmlString ValidationMessageFor([NotNull] this IHtmlHelper htmlHelper, - [NotNull] Expression> expression, - string message, - object htmlAttributes, - string tag) - { - return htmlHelper.ValidationMessageFor(expression, message, htmlAttributes, tag); - } - public static HtmlString ValidationSummary([NotNull] this IHtmlHelper htmlHelper) { return htmlHelper.ValidationSummary(excludePropertyErrors: false, @@ -168,14 +150,5 @@ namespace Microsoft.AspNet.Mvc.Rendering { return htmlHelper.ValidationSummary(excludePropertyErrors, message, htmlAttributes, tag: null); } - - public static HtmlString ValidationSummary([NotNull] this IHtmlHelper htmlHelper, - bool excludePropertyErrors, - string message, - object htmlAttributes, - string tag) - { - return htmlHelper.ValidationSummary(excludePropertyErrors, message, htmlAttributes, tag); - } } }