Skip to content
This repository was archived by the owner on Dec 14, 2018. It is now read-only.

Commit 8266a19

Browse files
author
NTaylorMullen
committed
Addressed code review comments.
1 parent 02695f5 commit 8266a19

File tree

6 files changed

+25
-11
lines changed

6 files changed

+25
-11
lines changed

‎src/Microsoft.AspNet.Mvc.TagHelpers/LabelTagHelper.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,13 @@ public override async Task ProcessAsync(TagHelperContext context, TagHelperOutpu
4444
{
4545
output.MergeAttributes(tagBuilder);
4646

47-
var childContent = await context.GetChildContentAsync();
48-
4947
// We check for whitespace to detect scenarios such as:
5048
// <label for="Name">
5149
// </label>
5250
if (string.IsNullOrEmpty(output.Content))
5351
{
52+
var childContent = await context.GetChildContentAsync();
53+
5454
if (string.IsNullOrWhiteSpace(childContent))
5555
{
5656
// Provide default label text since there was nothing useful in the Razor source.

‎src/Microsoft.AspNet.Mvc.TagHelpers/ValidationMessageTagHelper.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,13 @@ public override async Task ProcessAsync(TagHelperContext context, TagHelperOutpu
4646
{
4747
output.MergeAttributes(tagBuilder);
4848

49-
var childContent = await context.GetChildContentAsync();
50-
5149
// We check for whitespace to detect scenarios such as:
5250
// <span validation-for="Name">
5351
// </span>
5452
if (string.IsNullOrEmpty(output.Content))
5553
{
54+
var childContent = await context.GetChildContentAsync();
55+
5656
if (string.IsNullOrWhiteSpace(childContent))
5757
{
5858
// Provide default label text since there was nothing useful in the Razor source.

‎test/Microsoft.AspNet.Mvc.TagHelpers.Test/FormTagHelperTest.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -304,10 +304,7 @@ public async Task ProcessAsync_SupportsAntiForgeryIfActionIsSpecified(
304304
{ "aCTiON", "my-action" },
305305
});
306306
var context = new TagHelperContext(
307-
allAttributes: new Dictionary<string, object>()
308-
{
309-
{ "aCTiON", "http://www.contoso.com" }
310-
},
307+
allAttributes: new Dictionary<string, object>(),
311308
uniqueId: "test",
312309
getChildContentAsync: () => Task.FromResult("Something"));
313310

‎test/Microsoft.AspNet.Mvc.TagHelpers.Test/LabelTagHelperTest.cs

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,14 @@ public static TheoryData<object, Type, Func<object>, string, TagHelperOutputCont
5252
new TagHelperOutputContent(string.Empty, Environment.NewLine, Environment.NewLine, "Text") },
5353
{ modelWithNull, typeof(Model), () => modelWithNull.Text, "Text",
5454
new TagHelperOutputContent(Environment.NewLine, string.Empty, "Text", "Text") },
55+
{ modelWithNull, typeof(Model), () => modelWithNull.Text, "Text",
56+
new TagHelperOutputContent(Environment.NewLine, "Hello World", "Hello World", "Text") },
5557
{ modelWithText, typeof(Model), () => modelWithText.Text, "Text",
5658
new TagHelperOutputContent(string.Empty, Environment.NewLine, Environment.NewLine, "Text") },
5759
{ modelWithText, typeof(Model), () => modelWithText.Text, "Text",
5860
new TagHelperOutputContent(Environment.NewLine, string.Empty, "Text", "Text") },
61+
{ modelWithText, typeof(Model), () => modelWithText.Text, "Text",
62+
new TagHelperOutputContent(Environment.NewLine, "Hello World", "Hello World", "Text") },
5963
{ modelWithText, typeof(Model), () => modelWithNull.Text, "Text",
6064
new TagHelperOutputContent(string.Empty, "Hello World", "Hello World", "Text") },
6165
{ modelWithText, typeof(Model), () => modelWithText.Text, "Text",
@@ -71,10 +75,14 @@ public static TheoryData<object, Type, Func<object>, string, TagHelperOutputCont
7175

7276
{ modelWithNull, typeof(NestedModel), () => modelWithNull.NestedModel.Text, "NestedModel.Text",
7377
new TagHelperOutputContent(Environment.NewLine, string.Empty, "Text", "NestedModel_Text") },
78+
{ modelWithNull, typeof(NestedModel), () => modelWithNull.NestedModel.Text, "NestedModel.Text",
79+
new TagHelperOutputContent(Environment.NewLine, "Hello World", "Hello World", "NestedModel_Text") },
7480
{ modelWithNull, typeof(NestedModel), () => modelWithNull.NestedModel.Text, "NestedModel.Text",
7581
new TagHelperOutputContent(string.Empty, Environment.NewLine, Environment.NewLine, "NestedModel_Text") },
7682
{ modelWithText, typeof(NestedModel), () => modelWithText.NestedModel.Text, "NestedModel.Text",
7783
new TagHelperOutputContent(Environment.NewLine, string.Empty, "Text", "NestedModel_Text") },
84+
{ modelWithText, typeof(NestedModel), () => modelWithText.NestedModel.Text, "NestedModel.Text",
85+
new TagHelperOutputContent(Environment.NewLine, "Hello World", "Hello World", "NestedModel_Text") },
7886
{ modelWithText, typeof(NestedModel), () => modelWithText.NestedModel.Text, "NestedModel.Text",
7987
new TagHelperOutputContent(string.Empty, Environment.NewLine, Environment.NewLine, "NestedModel_Text") },
8088
{ modelWithNull, typeof(NestedModel), () => modelWithNull.NestedModel.Text, "NestedModel.Text",
@@ -94,10 +102,14 @@ public static TheoryData<object, Type, Func<object>, string, TagHelperOutputCont
94102
// into ModelExpressions. Will be fixed in https://github.com/aspnet/Mvc/issues/1345.
95103
{ models, typeof(Model), () => models[0].Text, "[0].Text",
96104
new TagHelperOutputContent(Environment.NewLine, string.Empty, "Text", "z0__Text") },
105+
{ models, typeof(Model), () => models[0].Text, "[0].Text",
106+
new TagHelperOutputContent(Environment.NewLine, "Hello World", "Hello World", "z0__Text") },
97107
{ models, typeof(Model), () => models[0].Text, "[0].Text",
98108
new TagHelperOutputContent(string.Empty, Environment.NewLine, Environment.NewLine, "z0__Text") },
99109
{ models, typeof(Model), () => models[1].Text, "[1].Text",
100110
new TagHelperOutputContent(Environment.NewLine, string.Empty, "Text", "z1__Text") },
111+
{ models, typeof(Model), () => models[1].Text, "[1].Text",
112+
new TagHelperOutputContent(Environment.NewLine, "Hello World", "Hello World", "z1__Text") },
101113
{ models, typeof(Model), () => models[1].Text, "[1].Text",
102114
new TagHelperOutputContent(string.Empty, Environment.NewLine, Environment.NewLine, "z1__Text") },
103115
{ models, typeof(Model), () => models[0].Text, "[0].Text",
@@ -115,10 +127,14 @@ public static TheoryData<object, Type, Func<object>, string, TagHelperOutputCont
115127

116128
{ models, typeof(NestedModel), () => models[0].NestedModel.Text, "[0].NestedModel.Text",
117129
new TagHelperOutputContent(Environment.NewLine, string.Empty, "Text", "z0__NestedModel_Text") },
130+
{ models, typeof(NestedModel), () => models[0].NestedModel.Text, "[0].NestedModel.Text",
131+
new TagHelperOutputContent(Environment.NewLine, "Hello World", "Hello World", "z0__NestedModel_Text") },
118132
{ models, typeof(NestedModel), () => models[0].NestedModel.Text, "[0].NestedModel.Text",
119133
new TagHelperOutputContent(string.Empty, Environment.NewLine, Environment.NewLine, "z0__NestedModel_Text") },
120134
{ models, typeof(NestedModel), () => models[1].NestedModel.Text, "[1].NestedModel.Text",
121135
new TagHelperOutputContent(Environment.NewLine, string.Empty, "Text", "z1__NestedModel_Text") },
136+
{ models, typeof(NestedModel), () => models[1].NestedModel.Text, "[1].NestedModel.Text",
137+
new TagHelperOutputContent(Environment.NewLine, "Hello World", "Hello World", "z1__NestedModel_Text") },
122138
{ models, typeof(NestedModel), () => models[1].NestedModel.Text, "[1].NestedModel.Text",
123139
new TagHelperOutputContent(string.Empty, Environment.NewLine, Environment.NewLine, "z1__NestedModel_Text") },
124140
{ models, typeof(NestedModel), () => models[0].NestedModel.Text, "[0].NestedModel.Text",

‎test/WebSites/TagHelpersWebSite/TagHelpers/PrettyTagHelper.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,9 @@ public class PrettyTagHelper : TagHelper
3333

3434
public override void Process(TagHelperContext context, TagHelperOutput output)
3535
{
36-
if (MakePretty.HasValue && !MakePretty.Value ||
36+
// Need to check if output.TagName == null in-case the ConditionTagHelper calls into SupressesOutput and
37+
// therefore sets the TagName == null.
38+
if (MakePretty.HasValue && !MakePretty.Value ||
3739
output.TagName == null)
3840
{
3941
return;

‎test/WebSites/TagHelpersWebSite/TagHelpers/WebsiteInformationTagHelper.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
using System;
55
using Microsoft.AspNet.Razor.Runtime.TagHelpers;
6-
using Microsoft.AspNet.Razor.TagHelpers;
76
using TagHelpersWebSite.Models;
87

98
namespace TagHelpersWebSite.TagHelpers
@@ -15,7 +14,7 @@ public class WebsiteInformationTagHelper : TagHelper
1514
public override void Process(TagHelperContext context, TagHelperOutput output)
1615
{
1716
output.TagName = "section";
18-
output.PreContent = string.Format(
17+
output.PostContent = string.Format(
1918
"<p><strong>Version:</strong> {0}</p>" + Environment.NewLine +
2019
"<p><strong>Copyright Year:</strong> {1}</p>" + Environment.NewLine +
2120
"<p><strong>Approved:</strong> {2}</p>" + Environment.NewLine +

0 commit comments

Comments
 (0)