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

fix export so no tags are omitted

Browse source
This commit is contained in:
webzwo0i 2013-12-08 11:31:23 +01:00
parent 03d5acfd0c
commit 86791707cd
1 changed files with 7 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -251,33 +251,24 @@ function getHTMLFromAtext(pad, atext, authorColors)
propVals[i] = true; // set it back propVals[i] = true; // set it back
} }
} }
// now each member of propVal is in {false,LEAVE,ENTER,true} // now each member of propVal is in {false,LEAVE,ENTER,true}
// according to what happens at start of span // false if not in this and not in previous, LEAVE if in previous, ENTER if new or true if
// in this and in the previous
// propChanged is true if any tag should be closed/opened
if (propChanged) if (propChanged)
{ {
// leaving bold (e.g.) also leaves italics, etc.
var left = false;
for (var i = 0; i < propVals.length; i++) for (var i = 0; i < propVals.length; i++)
{ {
var v = propVals[i]; var v = propVals[i];
if (!left) if (v === true && propVals.indexOf(LEAVE) != -1)
{
if (v === LEAVE)
{
left = true;
}
}
else
{
if (v === true)
{ {
propVals[i] = STAY; // tag will be closed and re-opened propVals[i] = STAY; // tag will be closed and re-opened
} }
} }
}
// close all tags that are open in previous op but not in this one
var tags2close = []; var tags2close = [];
for (var i = propVals.length - 1; i >= 0; i--) for (var i = propVals.length - 1; i >= 0; i--)
{ {
if (propVals[i] === LEAVE) if (propVals[i] === LEAVE)