From 860a33d9b3223a2559cfcc79532ec051f28f8493 Mon Sep 17 00:00:00 2001 From: agrath Date: Sun, 7 Aug 2011 14:07:09 -1200 Subject: [PATCH 01/12] Changed return type of Library.StripHtml to be HtmlString to facilitate partial strips feature still returning HTML and not wanting to encode the result --- .../RazorDynamicNode/RazorLibraryCore.cs | 81 ++++++++++++++++--- 1 file changed, 70 insertions(+), 11 deletions(-) diff --git a/umbraco.MacroEngines.Juno/RazorDynamicNode/RazorLibraryCore.cs b/umbraco.MacroEngines.Juno/RazorDynamicNode/RazorLibraryCore.cs index 8c3624c051..2b564c76e4 100644 --- a/umbraco.MacroEngines.Juno/RazorDynamicNode/RazorLibraryCore.cs +++ b/umbraco.MacroEngines.Juno/RazorDynamicNode/RazorLibraryCore.cs @@ -397,7 +397,7 @@ namespace umbraco.MacroEngines.Library insideTagSpaceEncountered = true; //if (!isTagClose) //{ - // tagStack.Push(currentTag); + // tagStack.Push(currentTag); //} } } @@ -453,22 +453,52 @@ namespace umbraco.MacroEngines.Library } - public string StripHtml(IHtmlString html) + public HtmlString StripHtml(IHtmlString html) { - return StripHtml(html.ToHtmlString()); + return StripHtml(html.ToHtmlString(), (List)null); } - public string StripHtml(DynamicNull html) + public HtmlString StripHtml(DynamicNull html) { - return string.Empty; + return new HtmlString(string.Empty); } - public string StripHtml(string html) + public HtmlString StripHtml(string html) { - return StripHtmlTags(html); + return StripHtmlTags(html, (List)null); + } + + public HtmlString StripHtml(IHtmlString html, List tags) + { + return StripHtml(html.ToHtmlString(), tags); + } + public HtmlString StripHtml(DynamicNull html, List tags) + { + return new HtmlString(string.Empty); + } + public HtmlString StripHtml(string html, List tags) + { + return StripHtmlTags(html, tags); + } + + public HtmlString StripHtml(IHtmlString html, params string[] tags) + { + return StripHtml(html.ToHtmlString(), tags.ToList()); + } + public HtmlString StripHtml(DynamicNull html, params string[] tags) + { + return new HtmlString(string.Empty); + } + public HtmlString StripHtml(string html, params string[] tags) + { + return StripHtmlTags(html, tags.ToList()); } //ge: this method won't deal with