mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-05-09 16:35:01 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge e9b22e8ac3 into aa986ab954

Browse source
This commit is contained in:
gedion 2012-08-11 13:45:15 -07:00
commit 65eb57f29d
1 changed files with 17 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -20,7 +20,7 @@ var Changeset = require("ep_etherpad-lite/static/js/Changeset");
var padManager = require("../db/PadManager");
var ERR = require("async-stacktrace");
var Security = require('ep_etherpad-lite/static/js/security');
var hooks = require('ep_etherpad-lite/static/js/pluginfw/hooks');
function getPadPlainText(pad, revNum)
{
var atext = ((revNum !== undefined) ? pad.getInternalRevisionAText(revNum) : pad.atext());
@ -402,9 +402,23 @@ function getHTMLFromAtext(pad, atext)
}
lists.length--;
}
var lineContentFromHook = hooks.callAllStr("getLineHTMLForExport",
{
line: line,
apool: apool,
attribLine: attribLines[i],
text: textLines[i]
}, " ", " ", "");
if (lineContentFromHook)
{
pieces.push(lineContentFromHook, '');
}
else
{
pieces.push(lineContent, '<br>');
}
}
}
for (var k = lists.length - 1; k >= 0; k--)
{