From baee4a0661944be3717e10ebadd9720ae6065433 Mon Sep 17 00:00:00 2001 From: Ajay Bhargav Baaskaran Date: Mon, 13 Jul 2015 14:30:22 -0700 Subject: [PATCH] [Fixes #2780] Use type=text for float and double --- src/Microsoft.AspNet.Mvc.TagHelpers/InputTagHelper.cs | 3 --- .../Rendering/Internal/TemplateRenderer.cs | 2 -- .../InputTagHelperTest.cs | 8 ++++---- .../Rendering/DefaultEditorTemplatesTest.cs | 8 ++++---- 4 files changed, 8 insertions(+), 13 deletions(-) diff --git a/src/Microsoft.AspNet.Mvc.TagHelpers/InputTagHelper.cs b/src/Microsoft.AspNet.Mvc.TagHelpers/InputTagHelper.cs index c6cc959b87..6bc204f7bd 100644 --- a/src/Microsoft.AspNet.Mvc.TagHelpers/InputTagHelper.cs +++ b/src/Microsoft.AspNet.Mvc.TagHelpers/InputTagHelper.cs @@ -43,10 +43,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers { nameof(UInt32), "number" }, { nameof(Int64), "number" }, { nameof(UInt64), "number" }, - { nameof(Single), "number" }, - { nameof(Double), "number" }, { nameof(Boolean), InputType.CheckBox.ToString().ToLowerInvariant() }, - { nameof(Decimal), InputType.Text.ToString().ToLowerInvariant() }, { nameof(String), InputType.Text.ToString().ToLowerInvariant() }, { nameof(IFormFile), "file" }, { TemplateRenderer.IEnumerableOfIFormFileName, "file" }, diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Internal/TemplateRenderer.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Internal/TemplateRenderer.cs index f6b60a87e8..09c7aa2228 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Internal/TemplateRenderer.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Internal/TemplateRenderer.cs @@ -60,8 +60,6 @@ namespace Microsoft.AspNet.Mvc.Rendering.Internal { typeof(uint).Name, DefaultEditorTemplates.NumberInputTemplate }, { typeof(long).Name, DefaultEditorTemplates.NumberInputTemplate }, { typeof(ulong).Name, DefaultEditorTemplates.NumberInputTemplate }, - { typeof(float).Name, DefaultEditorTemplates.NumberInputTemplate }, - { typeof(double).Name, DefaultEditorTemplates.NumberInputTemplate }, { typeof(bool).Name, DefaultEditorTemplates.BooleanTemplate }, { typeof(decimal).Name, DefaultEditorTemplates.DecimalTemplate }, { typeof(string).Name, DefaultEditorTemplates.StringTemplate }, diff --git a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/InputTagHelperTest.cs b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/InputTagHelperTest.cs index e2ab61f516..a3ab7a81ef 100644 --- a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/InputTagHelperTest.cs +++ b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/InputTagHelperTest.cs @@ -731,15 +731,15 @@ namespace Microsoft.AspNet.Mvc.TagHelpers { "datetime", null, "datetime" }, { "datetime-local", null, "datetime-local" }, { "DATETIME-local", null, "datetime-local" }, - { "Decimal", "{0:0.00}", "text" }, - { "Double", null, "number" }, + { "Decimal", null, "text" }, + { "Double", null, "text" }, { "Int16", null, "number" }, { "Int32", null, "number" }, { "int32", null, "number" }, { "Int64", null, "number" }, { "SByte", null, "number" }, - { "Single", null, "number" }, - { "SINGLE", null, "number" }, + { "Single", null, "text" }, + { "SINGLE", null, "text" }, { "string", null, "text" }, { "STRING", null, "text" }, { "text", null, "text" }, diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/DefaultEditorTemplatesTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/DefaultEditorTemplatesTest.cs index a8b2f2f089..b849631abe 100644 --- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/DefaultEditorTemplatesTest.cs +++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/DefaultEditorTemplatesTest.cs @@ -71,10 +71,10 @@ namespace Microsoft.AspNet.Mvc.Core { "INT64", "__TextBox__ class='text-box single-line' type='number'" }, { "UInt64", "__TextBox__ class='text-box single-line' type='number'" }, { "uint64", "__TextBox__ class='text-box single-line' type='number'" }, - { "Single", "__TextBox__ class='text-box single-line' type='number'" }, - { "SINGLE", "__TextBox__ class='text-box single-line' type='number'" }, - { "Double", "__TextBox__ class='text-box single-line' type='number'" }, - { "double", "__TextBox__ class='text-box single-line' type='number'" }, + { "Single", "__TextBox__ class='text-box single-line'" }, + { "SINGLE", "__TextBox__ class='text-box single-line'" }, + { "Double", "__TextBox__ class='text-box single-line'" }, + { "double", "__TextBox__ class='text-box single-line'" }, { "Boolean", "__CheckBox__ class='check-box'" }, // Not tri-state b/c string is not a Nullable type. { "BOOLEAN", "__CheckBox__ class='check-box'" }, { "Decimal", "__TextBox__ class='text-box single-line'" },