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 22:23:33 +01:00
Code Issues Projects Releases Wiki Activity

abiword shouldnt be used for HTML native documents

Browse source
This commit is contained in:
John McLear 2014-05-06 17:32:45 +01:00
parent e85d09400e
commit 6d38b05623
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/node/handler/ImportHandler.js
View file

@ -114,7 +114,10 @@ exports.doImport = function(req, res, padId)
//convert file to html //convert file to html
function(callback) { function(callback) {
if(!importHandledByPlugin){ if(!importHandledByPlugin){
if (abiword) { var fileEnding = path.extname(srcFile).toLowerCase();
var fileIsHTML = (fileEnding === ".html" || fileEnding === ".htm");
if (abiword && !fileIsHTML) {
console.warn("Using abiword");
abiword.convertFile(srcFile, destFile, "htm", function(err) { abiword.convertFile(srcFile, destFile, "htm", function(err) {
//catch convert errors //catch convert errors
if(err) { if(err) {