Compare commits

...

2 Commits

Author SHA1 Message Date
John McLear 9a3f775569 test fix 2020-08-30 11:31:14 +01:00
John McLear 1a97839a8a bugfix/import: doc import bugfix 2020-08-30 11:29:35 +01:00
2 changed files with 4 additions and 2 deletions

View File

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

View File

@ -110,7 +110,7 @@ describe('Imports and Exports', function(){
// For some reason word import does not work in testing..
// TODO: fix support for .doc files..
xit('Tries to import .doc that uses soffice or abiword', function(done) {
it('Tries to import .doc that uses soffice or abiword', function(done) {
if(!settings.allowAnyoneToImport) return done();
if((settings.abiword && settings.abiword.indexOf("/" === -1)) && (settings.office && settings.soffice.indexOf("/" === -1))) return done();