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

updated html export, run hooks also with lists

Browse source
This commit is contained in:
ilmar 2017-10-31 16:23:41 +02:00
parent c36a3264fe
commit 724b1d734b
1 changed files with 16 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -356,7 +356,15 @@ function getHTMLFromAtext(pad, atext, authorColors)
} }
} }
} }
var context = {
line: line,
lineContent: lineContent,
apool: apool,
attribLine: attribLines[i],
text: textLines[i],
padId: pad.id
}
var lineContentFromHook = hooks.callAll("getLineHTMLForExport", context);
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){ if(lists.length > 0){
@ -373,14 +381,14 @@ function getHTMLFromAtext(pad, atext, authorColors)
if(toOpen > 0){ if(toOpen > 0){
pieces.push(new Array(toOpen + 1).join('<ol>')) pieces.push(new Array(toOpen + 1).join('<ol>'))
} }
pieces.push('<ol class="'+line.listTypeName+'"><li>', lineContent || '<br>'); pieces.push('<ol class="'+line.listTypeName+'"><li>', context.lineContent || '<br>');
} }
else else
{ {
if(toOpen > 0){ if(toOpen > 0){
pieces.push(new Array(toOpen + 1).join('<ul>')) pieces.push(new Array(toOpen + 1).join('<ul>'))
} }
pieces.push('<ul class="'+line.listTypeName+'"><li>', lineContent || '<br>'); pieces.push('<ul class="'+line.listTypeName+'"><li>', context.lineContent || '<br>');
} }
} }
//the following code *seems* dead after my patch. //the following code *seems* dead after my patch.
@ -416,16 +424,16 @@ function getHTMLFromAtext(pad, atext, authorColors)
if(lists[lists.length - 1][1] == "number") if(lists[lists.length - 1][1] == "number")
{ {
pieces.push(new Array(toClose+1).join('</ol>')) pieces.push(new Array(toClose+1).join('</ol>'))
pieces.push('<li>', lineContent || '<br>'); pieces.push('<li>', context.lineContent || '<br>');
} }
else else
{ {
pieces.push(new Array(toClose+1).join('</ul>')) pieces.push(new Array(toClose+1).join('</ul>'))
pieces.push('<li>', lineContent || '<br>'); pieces.push('<li>', context.lineContent || '<br>');
} }
lists = lists.slice(0,whichList+1) lists = lists.slice(0,whichList+1)
} else { } else {
pieces.push('</li><li>', lineContent || '<br>'); pieces.push('</li><li>', context.lineContent || '<br>');
} }
} }
} }
@ -451,22 +459,9 @@ function getHTMLFromAtext(pad, atext, authorColors)
padId: pad.id padId: pad.id
} }
var lineContentFromHook = hooks.callAllStr("getLineHTMLForExport", context, " ", " ", ""); hooks.callAll("getLineHTMLForExport", context);
if (lineContentFromHook) pieces.push(context.lineContent, '<br>');
{
var lcToTestTrue = lineContentFromHook;
lcToTestTrue = lcToTestTrue.replace(/true/g, '').replace(/ /g, '');
if (context.lineContent === lineContent && lcToTestTrue.length) { // Just to be compatible with plugins that are not updated to this solution
pieces.push(lineContentFromHook, '');
} else {
pieces.push(context.lineContent, ''); // should be used instead of lineContentFromHook because context is passed through each hook with all it's updated from each plugin
}
}
else
{
pieces.push(lineContent, '<br>');
}
} }
} }