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

Made the new @Library.StripHtml (HtmlAgilityPack based) handle strings which don't contain HTML

Browse Source
This commit is contained in:
agrath
2011-10-09 06:24:06 -13:00
parent 407f78c84b
commit 0851c04646
1 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
umbraco.MacroEngines.Juno/RazorDynamicNode/RazorLibraryCore.cs
View File

@@ -507,24 +507,33 @@ namespace umbraco.MacroEngines.Library
using (MemoryStream ms = new MemoryStream())
{
List<HtmlNode> targets = new List<HtmlNode>();
foreach (var node in doc.DocumentNode.FirstChild.SelectNodes(".//*"))
var nodes = doc.DocumentNode.FirstChild.SelectNodes(".//*");
if (nodes != null)
{
//is element
if (node.NodeType == HtmlNodeType.Element)
foreach (var node in nodes)
{
bool filterAllTags = (tags == null || tags.Count == 0);
if (filterAllTags || tags.Any(tag => string.Equals(tag, node.Name, StringComparison.CurrentCultureIgnoreCase)))
//is element
if (node.NodeType == HtmlNodeType.Element)
{
targets.Add(node);
bool filterAllTags = (tags == null || tags.Count == 0);
if (filterAllTags || tags.Any(tag => string.Equals(tag, node.Name, StringComparison.CurrentCultureIgnoreCase)))
{
targets.Add(node);
}
}
}
}
foreach (var target in targets)
{
HtmlNode content = doc.CreateTextNode(target.InnerText);
target.ParentNode.ReplaceChild(content, target);
}
foreach (var target in targets)
{
HtmlNode content = doc.CreateTextNode(target.InnerText);
target.ParentNode.ReplaceChild(content, target);
}
}
else
{
return new HtmlString(html);
}
return new HtmlString(doc.DocumentNode.FirstChild.InnerHtml);
}
}