libretic/etherpad-lite
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

workaround so that at least one tag stays open if its the outermost tag. saves some space in the output

Browse source
This commit is contained in:
webzwo0i 2013-12-08 11:37:07 +01:00
parent 656a558af9
commit 51769585a9
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/node/utils/ExportHtml.js
View file

@ -306,18 +306,20 @@ function getHTMLFromAtext(pad, atext, authorColors)
tags2close.push(i); tags2close.push(i);
propVals[i] = false; propVals[i] = false;
} }
else if (propVals[i] === STAY) else if (propVals[i] === STAY && openTags[openTags.length - 1] != i)
{ {
//emitCloseTag(i); //emitCloseTag(i);
tags2close.push(i); tags2close.push(i);
} }
} }
orderdCloseTags(tags2close); orderdCloseTags(tags2close);
// open all tags that are used in this op or got closed to satisfy order
// e.g. <em><s><u>em&strikethrough&underline</u>strikethrough&em</s></em><s>strikethrough</s>
// TODO?: ensure the best ie shortest resolution
for (var i = 0; i < propVals.length; i++) for (var i = 0; i < propVals.length; i++)
{ {
if (propVals[i] === ENTER || propVals[i] === STAY) if (propVals[i] === ENTER || (propVals[i] === STAY && openTags[openTags.length - 1] != i))
{ {
emitOpenTag(i); emitOpenTag(i);
propVals[i] = true; propVals[i] = true;