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

Fixed a bug in @Library.Truncate regarding attempting to close tags which were not open when the truncation occurred before any tags had been opened.

Browse Source
This commit is contained in:
agrath
2011-07-31 11:16:45 -12:00
parent 2ea3c4b624
commit 13e5e5a8df
1 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -333,7 +333,10 @@ namespace umbraco.MacroEngines.Library
if (ic == (int)'<')
{
IsInsideElement = true;
if (!lengthReached)
{
IsInsideElement = true;
}
insideTagSpaceEncountered = false;
currentTag = string.Empty;
isTagClose = false;
@@ -344,26 +347,29 @@ namespace umbraco.MacroEngines.Library
}
else if (ic == (int)'>')
{
IsInsideElement = false;
//if (write)
//{
// outputtw.Write('>');
//}
currentTextLength++;
if (isTagClose && tagStack.Count > 0)
if (IsInsideElement)
{
string thisTag = tagStack.Pop();
outputtw.Write("</" + thisTag + ">");
}
if (!isTagClose && currentTag.Length > 0)
{
if (!lengthReached)
IsInsideElement = false;
//if (write)
//{
// outputtw.Write('>');
//}
currentTextLength++;
if (isTagClose && tagStack.Count > 0)
{
tagStack.Push(currentTag);
outputtw.Write("<" + currentTag);
if (tr.Peek() != (int)' ')
string thisTag = tagStack.Pop();
outputtw.Write("</" + thisTag + ">");
}
if (!isTagClose && currentTag.Length > 0)
{
if (!lengthReached)
{
outputtw.Write(">");
tagStack.Push(currentTag);
outputtw.Write("<" + currentTag);
if (tr.Peek() != (int)' ')
{
outputtw.Write(">");
}
}
}
}