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-01-19 06:03:34 +01:00
Code Issues Projects Releases Wiki Activity

lists: bugfix: only show bullet list item on correct item

Browse source
This commit is contained in:
John McLear 2021-03-16 16:15:40 +00:00
parent 0aa4e9370b
commit 519d839e86
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -311,6 +311,11 @@ const getHTMLFromAtext = async (pad, atext, authorColors) => {
if (i < textLines.length) {
nextLine = _analyzeLine(textLines[i + 1], attribLines[i + 1], apool);
}
// lineBulletLevel is used to ensure that the bullet is only drawn on
// the <ul> item that needs to display a bullet, this is to stop multiple
// bullets being drawn in an indented list.
// https://github.com/ether/etherpad-lite/issues/4426 for details.
let lineBulletLevel = 1;
await hooks.aCallAll('getLineHTMLForExport', context);
// To create list parent elements
if ((!prevLine || prevLine.listLevel !== line.listLevel) ||
@ -386,7 +391,13 @@ const getHTMLFromAtext = async (pad, atext, authorColors) => {
pieces.push(`<ol class="${line.listTypeName}">`);
}
} else {
pieces.push(`<ul class="${line.listTypeName}">`);
// listLevel is when we want to include bullet
if (lineBulletLevel === line.listLevel) {
pieces.push(`<ul class="${line.listTypeName}">`);
} else {
pieces.push('<ul class="indent">');
lineBulletLevel++;
}
}
}
}