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

Update `RestrictChildrenAttribute`s properties and parameters to have consistent names. 

- Other attributes such as `TargetElement` have names referring to tag names as "tags". This update makes both attributes more consistent.

#517
This commit is contained in:
N. Taylor Mullen 2015-09-13 11:57:48 -07:00
parent 9ab9a330ed
commit 4fd866f340
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Microsoft.AspNet.Razor.Runtime/TagHelpers/RestrictChildrenAttribute.cs
View File

@ -18,25 +18,25 @@ namespace Microsoft.AspNet.Razor.Runtime.TagHelpers
/// <summary>
/// Instantiates a new instance of the <see cref="RestrictChildrenAttribute"/> class.
/// </summary>
/// <param name="tagName">
/// <param name="childTag">
/// The tag name of an element allowed as a child. Tag helpers must target the element.
/// </param>
/// <param name="tagNames">
/// <param name="childTags">
/// Additional names of elements allowed as children. Tag helpers must target all such elements.
/// </param>
public RestrictChildrenAttribute(string tagName, params string[] tagNames)
public RestrictChildrenAttribute(string childTag, params string[] childTags)
{
var concatenatedNames = new string[1 + tagNames.Length];
concatenatedNames[0] = tagName;
var concatenatedNames = new string[1 + childTags.Length];
concatenatedNames[0] = childTag;
tagNames.CopyTo(concatenatedNames, 1);
childTags.CopyTo(concatenatedNames, 1);
ChildTagNames = concatenatedNames;
ChildTags = concatenatedNames;
}
/// <summary>
/// Get the names of elements allowed as children. Tag helpers must target all such elements.
/// </summary>
public IEnumerable<string> ChildTagNames { get; }
public IEnumerable<string> ChildTags { get; }
}
}

2
src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperDescriptorFactory.cs
View File

@ -157,7 +157,7 @@ namespace Microsoft.AspNet.Razor.Runtime.TagHelpers
return null;
}
var allowedChildren = restrictChildrenAttribute.ChildTagNames;
var allowedChildren = restrictChildrenAttribute.ChildTags;
var validAllowedChildren = GetValidAllowedChildren(allowedChildren, typeInfo.FullName, errorSink);
if (validAllowedChildren.Any())

4
test/Microsoft.AspNet.Razor.Runtime.Precompilation.Test/PrecompilationTagHelperTypeResolverTest.cs
View File

@ -181,8 +181,8 @@ namespace Microsoft.AspNet.Razor.Runtime.Precompilation
(expectedAttribute, actualAttribute) =>
{
Assert.Equal(
expectedAttribute.ChildTagNames,
actualAttribute.ChildTagNames);
expectedAttribute.ChildTags,
actualAttribute.ChildTags);
});
// Complex array bindings