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

7728 - show elipsis only when > length

Browse Source 
Fixed the elipsis issue, only adds an elipisis if the text length exceeds the length that is being truncated too.
This commit is contained in:
Matt Barlow
2020-02-27 12:59:34 +01:00
committed by Sebastiaan Janssen
parent 994c379a94
commit 7c841eb6ac
1 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -243,21 +243,27 @@ namespace Umbraco.Web
}
}
if (!lengthReached && currentTextLength >= length)
if (!lengthReached)
{
// if the last character added was the first of a two character unicode pair, add the second character
if (Char.IsHighSurrogate((char)ic))
if (currentTextLength == length)
{
var lowSurrogate = tr.Read();
outputtw.Write((char)lowSurrogate);
}
// if the last character added was the first of a two character unicode pair, add the second character
if (char.IsHighSurrogate((char)ic))
{
var lowSurrogate = tr.Read();
outputtw.Write((char)lowSurrogate);
}
// Reached truncate limit.
if (addElipsis)
{
outputtw.Write(hellip);
}
lengthReached = true;
// only add elipsis if current length greater than original length
if (currentTextLength > length)
{
if (addElipsis)
{
outputtw.Write(hellip);
}
lengthReached = true;
}
}
}