lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-11-24 16:53:10 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #6050 from Codinlab/fixes/6023

Browse Source 
Fixes #6023 : Ellipsize can spilt an HTML encoded character
This commit is contained in:
Sébastien Ros
2015-11-19 12:19:11 -08:00
parent b32fc1b7ba 411e04b56a
commit bd00caf5be
4 changed files with 35 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/Orchard.Tests/Mvc/Html/HtmlHelperExtensionsTests.cs
View File

@@ -193,5 +193,35 @@ namespace Orchard.Tests.Mvc.Html {
Assert.AreEqual(@"<label for=""prefix_SomeString"">bar</label>", result.ToString());
}
private class FooController : Controller { }
[Test]
public void Ellipsize_DontCutHtmlEncodedChars() {
//arrange
var viewContext = new ViewContext();
var viewDataContainer = new Mock<IViewDataContainer>();
var html = new HtmlHelper(viewContext, viewDataContainer.Object);
//act
var result = html.Ellipsize("foo & bar", 5);
//assert
Assert.AreEqual("foo &amp;&#160;\u2026", result.ToString());
}
[Test]
public void Excerpt_DontCutHtmlEncodedChars() {
//arrange
var viewContext = new ViewContext();
var viewDataContainer = new Mock<IViewDataContainer>();
var html = new HtmlHelper(viewContext, viewDataContainer.Object);
//act
var result = html.Excerpt("<p>foo &amp; bar</p>", 7);
//assert
Assert.AreEqual("foo &amp;&#160;\u2026", result.ToString());
}
}
}

2
src/Orchard.Tests/Utility/Extensions/StringExtensionsTests.cs
View File

@@ -52,7 +52,7 @@ namespace Orchard.Tests.Utility.Extensions {
[Test]
public void Ellipsize_LongStringTruncatedToNearestWord() {
const string toEllipsize = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas sed purus quis purus orci aliquam.";
Assert.That(toEllipsize.Ellipsize(46), Is.StringMatching("Lorem ipsum dolor sit amet, consectetur&#160;&#8230;"));
Assert.That(toEllipsize.Ellipsize(46), Is.StringMatching("Lorem ipsum dolor sit amet, consectetur\u00A0\u2026"));
}
[Test]

7
src/Orchard/Mvc/Html/HtmlHelperExtensions.cs
View File

@@ -175,11 +175,11 @@ namespace Orchard.Mvc.Html {
#region Ellipsize
public static IHtmlString Ellipsize(this HtmlHelper htmlHelper, string text, int characterCount) {
return new HtmlString(htmlHelper.Encode(text).Ellipsize(characterCount));
return new HtmlString(htmlHelper.Encode(text.Ellipsize(characterCount)));
}
public static IHtmlString Ellipsize(this HtmlHelper htmlHelper, string text, int characterCount, string ellipsis) {
return new HtmlString(htmlHelper.Encode(text).Ellipsize(characterCount, ellipsis));
return new HtmlString(htmlHelper.Encode(text.Ellipsize(characterCount, ellipsis)));
}
#endregion
@@ -187,8 +187,7 @@ namespace Orchard.Mvc.Html {
#region Excerpt
public static MvcHtmlString Excerpt(this HtmlHelper html, string markup, int length) {
return MvcHtmlString.Create(markup.RemoveTags().Ellipsize(length));
return MvcHtmlString.Create(html.Encode(HttpUtility.HtmlDecode(markup.RemoveTags()).Ellipsize(length)));
}
#endregion

2
src/Orchard/Utility/Extensions/StringExtensions.cs
View File

@@ -26,7 +26,7 @@ namespace Orchard.Utility.Extensions {
}
public static string Ellipsize(this string text, int characterCount) {
return text.Ellipsize(characterCount, "&#160;&#8230;");
return text.Ellipsize(characterCount, "\u00A0\u2026");
}
public static string Ellipsize(this string text, int characterCount, string ellipsis, bool wordBoundary = false) {