Merge branch 'release' into dev

This commit is contained in:
Ajay Bhargav Baaskaran 2015-07-16 15:45:56 -07:00
commit c6302ff026
2 changed files with 4 additions and 1 deletions

View File

@ -43,7 +43,10 @@ namespace Microsoft.AspNet.Mvc.TagHelpers
{ nameof(UInt32), "number" },
{ nameof(Int64), "number" },
{ nameof(UInt64), "number" },
{ nameof(Single), InputType.Text.ToString().ToLowerInvariant() },
{ nameof(Double), InputType.Text.ToString().ToLowerInvariant() },
{ nameof(Boolean), InputType.CheckBox.ToString().ToLowerInvariant() },
{ nameof(Decimal), InputType.Text.ToString().ToLowerInvariant() },
{ nameof(String), InputType.Text.ToString().ToLowerInvariant() },
{ nameof(IFormFile), "file" },
{ TemplateRenderer.IEnumerableOfIFormFileName, "file" },

View File

@ -731,7 +731,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers
{ "datetime", null, "datetime" },
{ "datetime-local", null, "datetime-local" },
{ "DATETIME-local", null, "datetime-local" },
{ "Decimal", null, "text" },
{ "Decimal", "{0:0.00}", "text" },
{ "Double", null, "text" },
{ "Int16", null, "number" },
{ "Int32", null, "number" },