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

Merge with 6.0.6

Browse Source
This commit is contained in:
Sebastiaan Janssen
2013-05-06 12:07:22 -02:00
parent 004d9ab3e6 f9fc2619fa
commit 950cb1436a
1 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/NodeExtensions.cs
View File

@@ -22,7 +22,7 @@ namespace umbraco
/// <returns>Returns an ancestor node by path level.</returns>
public static Node GetAncestorByPathLevel(this Node node, int level)
{
return (Node) GetAncestorByPathLevel((INode) node, level);
return (Node)GetAncestorByPathLevel((INode)node, level);
}
/// <summary>
@@ -206,7 +206,7 @@ namespace umbraco
/// <returns>Node as IEnumerable</returns>
public static IEnumerable<Node> GetDescendantNodes(this Node node)
{
return GetDescendantNodes((INode) node).Cast<Node>();
return GetDescendantNodes((INode)node).Cast<Node>();
}
/// <summary>
@@ -238,7 +238,8 @@ namespace umbraco
/// <returns>Nodes as IEnumerable</returns>
public static IEnumerable<Node> GetDescendantNodes(this Node node, Func<Node, bool> func)
{
return GetDescendantNodes((INode)node, (Func<INode, bool>) func).Cast<Node>();
Func<INode, bool> convertedFunc = x => func((Node)x);
return GetDescendantNodes((INode)node, convertedFunc).Cast<Node>();
}
/// <summary>
@@ -322,7 +323,8 @@ namespace umbraco
/// <returns>Nodes as IEnumerable</returns>
public static IEnumerable<Node> GetChildNodes(this Node node, Func<Node, bool> func)
{
return GetChildNodes((INode)node, (Func<INode, bool>) func).Cast<Node>();
Func<INode, bool> convertedFunc = x => func((Node)x);
return GetChildNodes((INode)node, convertedFunc).Cast<Node>();
}
/// <summary>
@@ -372,7 +374,7 @@ namespace umbraco
/// <returns>null or Node</returns>
public static Node GetChildNodeByName(this Node parentNode, string nodeName)
{
return (Node) GetChildNodeByName((INode)parentNode, nodeName);
return (Node)GetChildNodeByName((INode)parentNode, nodeName);
}
/// <summary>
@@ -477,16 +479,16 @@ namespace umbraco
}
// // umbraco.MacroEngines DynamicXml
// else if (typeof(T) == typeof(DynamicXml))
// {
// try
// {
// return (T)((object)new DynamicXml(node.GetPropertyAsString(propertyAlias)));
// }
// catch
// {
// }
// }
// else if (typeof(T) == typeof(DynamicXml))
// {
// try
// {
// return (T)((object)new DynamicXml(node.GetPropertyAsString(propertyAlias)));
// }
// catch
// {
// }
// }
else
{
try
@@ -601,7 +603,7 @@ namespace umbraco
/// <returns>Returns an <c>XmlNode</c> for the selected Node</returns>
public static XmlNode ToXml(this Node node)
{
return ToXml((INode) node);
return ToXml((INode)node);
}
/// <summary>
@@ -676,7 +678,7 @@ namespace umbraco
/// <returns>the same node object on which this is an extension method</returns>
public static Node SetProperty(this Node node, string propertyAlias, object value)
{
return (Node) SetProperty((INode)node, propertyAlias, value);
return (Node)SetProperty((INode)node, propertyAlias, value);
}
/// <summary>
@@ -703,7 +705,7 @@ namespace umbraco
/// <returns>the same node object on which this is an extension method</returns>
public static Node Publish(this Node node, bool useAdminUser)
{
return (Node) Publish((INode)node, useAdminUser);
return (Node)Publish((INode)node, useAdminUser);
}
/// <summary>