Reacting to Mvc TagBuilder changes.
This commit is contained in:
parent
b271887d9f
commit
e0c5e6c2fb
|
|
@ -141,7 +141,8 @@ namespace Microsoft.AspNet.Mvc.Rendering
|
||||||
|
|
||||||
var tag = new TagBuilder("input");
|
var tag = new TagBuilder("input");
|
||||||
tag.MergeAttributes(MergeAttributes(ngAttributes, htmlAttributes));
|
tag.MergeAttributes(MergeAttributes(ngAttributes, htmlAttributes));
|
||||||
return tag.ToHtmlContent(TagRenderMode.SelfClosing);
|
tag.TagRenderMode = TagRenderMode.SelfClosing;
|
||||||
|
return tag;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static bool IsNumberType(Type type)
|
private static bool IsNumberType(Type type)
|
||||||
|
|
@ -221,7 +222,7 @@ namespace Microsoft.AspNet.Mvc.Rendering
|
||||||
var nullOptionTag = new TagBuilder("option");
|
var nullOptionTag = new TagBuilder("option");
|
||||||
nullOptionTag.Attributes["value"] = string.Empty;
|
nullOptionTag.Attributes["value"] = string.Empty;
|
||||||
nullOptionTag.SetInnerText(nullOption);
|
nullOptionTag.SetInnerText(nullOption);
|
||||||
tag.InnerHtml = nullOptionTag.ToHtmlContent(TagRenderMode.Normal);
|
tag.InnerHtml = nullOptionTag;
|
||||||
}
|
}
|
||||||
|
|
||||||
var clientValidators = html.GetClientValidationRules(metadata, null);
|
var clientValidators = html.GetClientValidationRules(metadata, null);
|
||||||
|
|
@ -233,7 +234,7 @@ namespace Microsoft.AspNet.Mvc.Rendering
|
||||||
|
|
||||||
tag.MergeAttributes(htmlAttributes, replaceExisting: true);
|
tag.MergeAttributes(htmlAttributes, replaceExisting: true);
|
||||||
|
|
||||||
return tag.ToHtmlContent(TagRenderMode.Normal);
|
return tag;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static IHtmlContent ngValidationMessageFor<TModel, TProperty>(this IHtmlHelper<TModel> htmlHelper, Expression<Func<TModel, TProperty>> expression, string formName)
|
public static IHtmlContent ngValidationMessageFor<TModel, TProperty>(this IHtmlHelper<TModel> htmlHelper, Expression<Func<TModel, TProperty>> expression, string formName)
|
||||||
|
|
|
||||||
|
|
@ -27,7 +27,7 @@ namespace Microsoft.AspNet.Mvc.Rendering
|
||||||
innerContent.Replace("<", "\u003C").Replace(">", "\u003E");
|
innerContent.Replace("<", "\u003C").Replace(">", "\u003E");
|
||||||
builder.InnerHtml = new HtmlString(innerContent);
|
builder.InnerHtml = new HtmlString(innerContent);
|
||||||
|
|
||||||
return builder.ToHtmlContent(TagRenderMode.Normal);
|
return builder;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static IHtmlContent InlineData<T>(this IHtmlHelper<T> helper, string actionName, string controllerName)
|
public static IHtmlContent InlineData<T>(this IHtmlHelper<T> helper, string actionName, string controllerName)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue