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

Merge branch 'TEMP-u4-10135' of https://github.com/umbraco/Umbraco-CMS into TEMP-u4-10135

Browse Source 
# Conflicts:
#	src/Umbraco.Web/HtmlStringUtilities.cs
This commit is contained in:
Shannon
2017-09-06 10:05:00 +10:00
parent 4b5c49907c 972d5f8296
commit a603fd0c46
1 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/Umbraco.Web/HtmlStringUtilities.cs
View File

@@ -248,15 +248,15 @@ namespace Umbraco.Web
outputms.Position = 0;
using (TextReader outputtr = new StreamReader(outputms))
{
string result = String.Empty;
string result = string.Empty;
string firstTrim = outputtr.ReadToEnd().Replace(" ", " ").Trim();
//Check to see if there is an empty char between the hellip and the output string
//if there is, remove it
if (string.IsNullOrEmpty(firstTrim) == false)
if (string.IsNullOrWhiteSpace(firstTrim) == false)
{
result = firstTrim[firstTrim.Length - hellip.Length -1] == ' ' ? firstTrim.Remove(firstTrim.Length - hellip.Length -1, 1) : firstTrim;
result = firstTrim[firstTrim.Length - hellip.Length - 1] == ' ' ? firstTrim.Remove(firstTrim.Length - hellip.Length - 1, 1) : firstTrim;
}
return new HtmlString(result);
}
@@ -274,19 +274,17 @@ namespace Umbraco.Web
public int WordsToLength(string html, int words, bool tagsAsContent)
{
HtmlDocument doc = new HtmlDocument();
doc.LoadHtml(html);
int wordCount = 0,
length = 0,
insideTagCounter = length,
maxWords = words;
string strippedOfTags = string.Empty;
bool invalidHtml = doc.ParseErrors.Any();
//If tagsAsContent is on, use the string stripped of html tags
if (tagsAsContent == false)
{
doc.LoadHtml(html);
foreach (var node in doc.DocumentNode.ChildNodes)
{
strippedOfTags += node.InnerText;
@@ -304,13 +302,9 @@ namespace Umbraco.Web
//Check if we have a space inside a tag and increase the length if we do
if (html[length].Equals('<') && html[length + 1].Equals('/') == false && tagsAsContent)
{
while (html[insideTagCounter].Equals('>') == false)
while (html[length].Equals('>') == false && invalidHtml == false)
{
if (html[insideTagCounter].Equals(' '))
{
length++;
}
insideTagCounter++;
length++;
}
}
length++;