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

switch back to soffice standard converter; dont swallow newlines

Browse source
This commit is contained in:
webzwo0i 2020-09-14 12:30:00 +02:00
parent 2e48b88e70
commit d662bcd2fd
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/node/utils/ImportHtml.js
View file

@ -34,7 +34,7 @@ exports.setPadHTML = function(pad, html)
rehype() rehype()
.use(format, opts) .use(format, opts)
.process(html, function(err, output){ .process(html, function(err, output){
html = String(output).replace(/(\r\n|\n|\r)/gm,""); //html = String(output).replace(/(\r\n|\n|\r)/gm,"");
}) })
var $ = cheerio.load(html); var $ = cheerio.load(html);

2
src/node/utils/LibreOffice.js
View file

@ -43,7 +43,7 @@ exports.convertFile = function(srcFile, destFile, type, callback) {
if (type === "html") { if (type === "html") {
// "html:XHTML Writer File:UTF8" does a better job than normal html exports // "html:XHTML Writer File:UTF8" does a better job than normal html exports
type = "html:XHTML Writer File:UTF8" //type = "html:XHTML Writer File:UTF8"
// PDF files need to be converted with LO Draw ref https://github.com/ether/etherpad-lite/issues/4151 // PDF files need to be converted with LO Draw ref https://github.com/ether/etherpad-lite/issues/4151
if (path.extname(srcFile).toLowerCase() === ".pdf") { if (path.extname(srcFile).toLowerCase() === ".pdf") {