huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

SetContent to SetHtmlContent

This commit is contained in:
ryanbrandenburg 2016-03-24 16:48:44 -07:00
parent f5fbae6776
commit 21be7973ea
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Microsoft.AspNetCore.Razor.Runtime/Runtime/TagHelpers/TagHelperExecutionContext.cs
View File

@ -286,7 +286,7 @@ namespace Microsoft.AspNetCore.Razor.Runtime.TagHelpers
} }
} }
return new DefaultTagHelperContent().SetContent(childContent); return new DefaultTagHelperContent().SetHtmlContent(childContent);
} }
private void EnsureHtmlAttributes() private void EnsureHtmlAttributes()

4
src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/TagHelperContent.cs
View File

@ -33,9 +33,9 @@ namespace Microsoft.AspNetCore.Razor.TagHelpers
/// </summary> /// </summary>
/// <param name="htmlContent">The <see cref="IHtmlContent"/> that replaces the content.</param> /// <param name="htmlContent">The <see cref="IHtmlContent"/> that replaces the content.</param>
/// <returns>A reference to this instance after the set operation has completed.</returns> /// <returns>A reference to this instance after the set operation has completed.</returns>
public TagHelperContent SetContent(IHtmlContent htmlContent) public TagHelperContent SetHtmlContent(IHtmlContent htmlContent)
{ {
HtmlContentBuilderExtensions.SetContent(this, htmlContent); HtmlContentBuilderExtensions.SetHtmlContent(this, htmlContent);
return this; return this;
} }

4
test/Microsoft.AspNetCore.Razor.Runtime.Test/TagHelpers/DefaultTagHelperContentTest.cs
View File

@ -71,7 +71,7 @@ namespace Microsoft.AspNetCore.Razor.TagHelpers
[Theory] [Theory]
[InlineData("HelloWorld!", "HtmlEncode[[HelloWorld!]]")] [InlineData("HelloWorld!", "HtmlEncode[[HelloWorld!]]")]
[InlineData(" ", "HtmlEncode[[ ]]")] [InlineData(" ", "HtmlEncode[[ ]]")]
public void SetContent_WithTagHelperContent_WorksAsExpected(string content, string expected) public void SetHtmlContent_WithTagHelperContent_WorksAsExpected(string content, string expected)
{ {
// Arrange // Arrange
var tagHelperContent = new DefaultTagHelperContent(); var tagHelperContent = new DefaultTagHelperContent();
@ -79,7 +79,7 @@ namespace Microsoft.AspNetCore.Razor.TagHelpers
tagHelperContent.SetContent(content); tagHelperContent.SetContent(content);
// Act // Act
copiedTagHelperContent.SetContent(tagHelperContent); copiedTagHelperContent.SetHtmlContent(tagHelperContent);
// Assert // Assert
Assert.Equal(expected, copiedTagHelperContent.GetContent(new HtmlTestEncoder())); Assert.Equal(expected, copiedTagHelperContent.GetContent(new HtmlTestEncoder()));