SetContent->SetHtmlContent
This commit is contained in:
parent
5ddb17d2fe
commit
5fe284a486
|
|
@ -137,7 +137,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
|
||||||
// Clear the contents of the "cache" element since we don't want to render it.
|
// Clear the contents of the "cache" element since we don't want to render it.
|
||||||
output.SuppressOutput();
|
output.SuppressOutput();
|
||||||
|
|
||||||
output.Content.SetContent(content);
|
output.Content.SetHtmlContent(content);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Internal for unit testing
|
// Internal for unit testing
|
||||||
|
|
|
||||||
|
|
@ -85,7 +85,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
|
||||||
// Clear the contents of the "cache" element since we don't want to render it.
|
// Clear the contents of the "cache" element since we don't want to render it.
|
||||||
output.SuppressOutput();
|
output.SuppressOutput();
|
||||||
|
|
||||||
output.Content.SetContent(content);
|
output.Content.SetHtmlContent(content);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Internal for unit testing
|
// Internal for unit testing
|
||||||
|
|
|
||||||
|
|
@ -82,11 +82,11 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
|
||||||
if (childContent.IsWhiteSpace)
|
if (childContent.IsWhiteSpace)
|
||||||
{
|
{
|
||||||
// Provide default label text since there was nothing useful in the Razor source.
|
// Provide default label text since there was nothing useful in the Razor source.
|
||||||
output.Content.SetContent(tagBuilder.InnerHtml);
|
output.Content.SetHtmlContent(tagBuilder.InnerHtml);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
output.Content.SetContent(childContent);
|
output.Content.SetHtmlContent(childContent);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -264,7 +264,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
|
||||||
{
|
{
|
||||||
// Only HrefInclude is specified. Don't render the original tag.
|
// Only HrefInclude is specified. Don't render the original tag.
|
||||||
output.TagName = null;
|
output.TagName = null;
|
||||||
output.Content.SetContent(HtmlString.Empty);
|
output.Content.SetHtmlContent(HtmlString.Empty);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -279,7 +279,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
|
||||||
BuildFallbackBlock(builder);
|
BuildFallbackBlock(builder);
|
||||||
}
|
}
|
||||||
|
|
||||||
output.PostElement.SetContent(builder);
|
output.PostElement.SetHtmlContent(builder);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void BuildGlobbedLinkTags(TagHelperAttributeList attributes, TagHelperContent builder)
|
private void BuildGlobbedLinkTags(TagHelperAttributeList attributes, TagHelperContent builder)
|
||||||
|
|
|
||||||
|
|
@ -263,7 +263,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
|
||||||
BuildFallbackBlock(output.Attributes, builder);
|
BuildFallbackBlock(output.Attributes, builder);
|
||||||
}
|
}
|
||||||
|
|
||||||
output.PostElement.SetContent(builder);
|
output.PostElement.SetHtmlContent(builder);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void BuildGlobbedScriptTags(
|
private void BuildGlobbedScriptTags(
|
||||||
|
|
|
||||||
|
|
@ -71,7 +71,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
|
||||||
if (tagBuilder != null)
|
if (tagBuilder != null)
|
||||||
{
|
{
|
||||||
// Overwrite current Content to ensure expression result round-trips correctly.
|
// Overwrite current Content to ensure expression result round-trips correctly.
|
||||||
output.Content.SetContent(tagBuilder.InnerHtml);
|
output.Content.SetHtmlContent(tagBuilder.InnerHtml);
|
||||||
|
|
||||||
output.MergeAttributes(tagBuilder);
|
output.MergeAttributes(tagBuilder);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -86,11 +86,11 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
|
||||||
if (childContent.IsWhiteSpace)
|
if (childContent.IsWhiteSpace)
|
||||||
{
|
{
|
||||||
// Provide default label text since there was nothing useful in the Razor source.
|
// Provide default label text since there was nothing useful in the Razor source.
|
||||||
output.Content.SetContent(tagBuilder.InnerHtml);
|
output.Content.SetHtmlContent(tagBuilder.InnerHtml);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
output.Content.SetContent(childContent);
|
output.Content.SetHtmlContent(childContent);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue