Merge pull request #943 from gedion/develop

Add a hook for utils/ExportHtml.js
pull/931/merge
John McLear 2012-08-12 08:48:10 -07:00
commit a42b2440ba
1 changed files with 17 additions and 3 deletions

View File

@ -20,7 +20,7 @@ var Changeset = require("ep_etherpad-lite/static/js/Changeset");
var padManager = require("../db/PadManager"); var padManager = require("../db/PadManager");
var ERR = require("async-stacktrace"); var ERR = require("async-stacktrace");
var Security = require('ep_etherpad-lite/static/js/security'); var Security = require('ep_etherpad-lite/static/js/security');
var hooks = require('ep_etherpad-lite/static/js/pluginfw/hooks');
function getPadPlainText(pad, revNum) function getPadPlainText(pad, revNum)
{ {
var atext = ((revNum !== undefined) ? pad.getInternalRevisionAText(revNum) : pad.atext()); var atext = ((revNum !== undefined) ? pad.getInternalRevisionAText(revNum) : pad.atext());
@ -401,8 +401,22 @@ function getHTMLFromAtext(pad, atext)
pieces.push('</li></ul>'); pieces.push('</li></ul>');
} }
lists.length--; lists.length--;
} }
pieces.push(lineContent, '<br>'); 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>');
}
} }
} }