fuwafuwa
/
etherpad-lite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

abiword shouldnt be used for HTML native documents

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
function(callback) {
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) {
//catch convert errors
if(err) {