libre-service.eu/pad.libre-service.eu-etherpad
libre-service.eu/pad.libre-service.eu-etherpad
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-02-01 03:12:42 +01:00
Code Issues Projects Releases Wiki Activity

fix export of lists with bullets; <li> are closed before the next list starts. also, when closing, ensure that list-items are not nested

Browse source
This commit is contained in:
webzwo0i 2014-12-28 02:31:26 +01:00
parent 53ca26d030
commit d71b11f4b2
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -328,6 +328,9 @@ function getHTMLFromAtext(pad, atext, authorColors)
if (whichList >= lists.length)//means we are on a deeper level of indentation than the previous line if (whichList >= lists.length)//means we are on a deeper level of indentation than the previous line
{ {
if(lists.length > 0){
pieces.push('</li>')
}
lists.push([line.listLevel, line.listTypeName]); lists.push([line.listLevel, line.listTypeName]);
if(line.listTypeName == "number") if(line.listTypeName == "number")
{ {
@ -363,7 +366,7 @@ function getHTMLFromAtext(pad, atext, authorColors)
pieces.push('<br><br>'); pieces.push('<br><br>');
} }
}*/ }*/
else//means we are getting closer to the lowest level of indentation else//means we are getting closer to the lowest level of indentation or are at the same level
{ {
while (whichList < lists.length - 1) while (whichList < lists.length - 1)
{ {
@ -382,15 +385,23 @@ function getHTMLFromAtext(pad, atext, authorColors)
} }
else//outside any list else//outside any list
{ {
if(lists.length > 0){
if(lists[lists.length - 1][1] == "number"){
pieces.push('</li></ol>');
} else {
pieces.push('</li></ul>');
}
lists.length--;
}
while (lists.length > 0)//if was in a list: close it before while (lists.length > 0)//if was in a list: close it before
{ {
if(lists[lists.length - 1][1] == "number") if(lists[lists.length - 1][1] == "number")
{ {
pieces.push('</li></ol>'); pieces.push('</ol>');
} }
else else
{ {
pieces.push('</li></ul>'); pieces.push('</ul>');
} }
lists.length--; lists.length--;
} }