mirror of
https://github.com/ether/etherpad-lite.git
synced 2025-05-05 22:57:11 -04:00
handler/ImportHandler: use jshint
This commit is contained in:
parent
da7098168e
commit
8e42192f2f
1 changed files with 31 additions and 29 deletions
|
@ -28,8 +28,10 @@ var formidable = require('formidable');
|
||||||
var os = require("os");
|
var os = require("os");
|
||||||
|
|
||||||
//load abiword only if its enabled
|
//load abiword only if its enabled
|
||||||
if(settings.abiword != null)
|
if(settings.abiword)
|
||||||
|
{
|
||||||
var abiword = require("../utils/Abiword");
|
var abiword = require("../utils/Abiword");
|
||||||
|
}
|
||||||
|
|
||||||
var tempDirectory = "/tmp/";
|
var tempDirectory = "/tmp/";
|
||||||
|
|
||||||
|
@ -139,17 +141,17 @@ exports.doImport = function(req, res, padId)
|
||||||
|
|
||||||
//node on windows has a delay on releasing of the file lock.
|
//node on windows has a delay on releasing of the file lock.
|
||||||
//We add a 100ms delay to work around this
|
//We add a 100ms delay to work around this
|
||||||
if(os.type().indexOf("Windows") > -1)
|
if(os.type().indexOf("Windows") > -1)
|
||||||
{
|
{
|
||||||
setTimeout(function()
|
setTimeout(function()
|
||||||
{
|
{
|
||||||
callback();
|
callback();
|
||||||
}, 100);
|
}, 100);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
callback();
|
callback();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
|
@ -188,4 +190,4 @@ exports.doImport = function(req, res, padId)
|
||||||
//close the connection
|
//close the connection
|
||||||
res.send("ok");
|
res.send("ok");
|
||||||
});
|
});
|
||||||
}
|
};
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue