yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added support for attribute first child fallback in DynamicXml

Browse Source
This commit is contained in:
agrath@gmail.com
2011-06-30 10:16:30 -12:00
parent c7c496cadf
commit 9b4a08950c
1 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
umbraco.MacroEngines.Juno/RazorDynamicNode/DynamicXml.cs
View File

@@ -84,6 +84,7 @@ namespace umbraco.MacroEngines
var elements = BaseElement.Elements(binder.Name);
if (elements.Count() == 0 && BaseElement.Name == "root" && BaseElement.Elements().Count() == 1)
{
//no elements matched, lets try first child
elements = BaseElement.Elements().ElementAt(0).Elements(binder.Name);
}
if (HandleIEnumerableXElement(elements, out result))
@@ -94,7 +95,7 @@ namespace umbraco.MacroEngines
{
//Ok, so no elements matched, so lets try attributes
var attributes = BaseElement.Attributes(binder.Name).Select(attr => attr.Value);
IEnumerable<string> attributes = BaseElement.Attributes(binder.Name).Select(attr => attr.Value);
int count = attributes.Count();
if (count > 0)
@@ -106,6 +107,21 @@ namespace umbraco.MacroEngines
return true; // return true because we matched
}
else
{
//no attributes matched, lets try first child
if (BaseElement.Name == "root" && BaseElement.Elements().Count() == 1)
{
attributes = BaseElement.Elements().ElementAt(0).Attributes(binder.Name).Select(attr => attr.Value);
count = attributes.Count();
if (count > 1)
result = attributes; //more than one attribute matched, lets return the collection
else
result = attributes.FirstOrDefault(); //only one attribute matched, lets just return it
return true; // return true because we matched
}
}
}
return base.TryGetMember(binder, out result);
}