From acbb75c1478d03d115e18c989b4c21a39dcacb3b Mon Sep 17 00:00:00 2001 From: booo Date: Thu, 22 Dec 2011 13:40:46 +0100 Subject: [PATCH] handler/ExportHandler: use jshint --- node/handler/ExportHandler.js | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/node/handler/ExportHandler.js b/node/handler/ExportHandler.js index a38c01606..d366e9731 100644 --- a/node/handler/ExportHandler.js +++ b/node/handler/ExportHandler.js @@ -28,39 +28,43 @@ var settings = require('../utils/Settings'); var os = require('os'); //load abiword only if its enabled -if(settings.abiword != null) +if(settings.abiword) +{ var abiword = require("../utils/Abiword"); +} var tempDirectory = "/tmp"; -//tempDirectory changes if the operating system is windows +//tempDirectory changes if the operating system is windows if(os.type().indexOf("Windows") > -1) { tempDirectory = process.env.TEMP; } - + /** * do a requested export - */ + */ exports.doExport = function(req, res, padId, type) { //tell the browser that this is a downloadable file res.attachment(padId + "." + type); + var randNum; + var srcFile; + var destFile; + //if this is a plain text export, we can do this directly if(type == "txt") { padManager.getPad(padId, function(err, pad) { ERR(err); - + res.send(pad.text()); }); } else if(type == 'dokuwiki') { - var randNum; - var srcFile, destFile; async.series([ //render the dokuwiki document @@ -71,7 +75,7 @@ exports.doExport = function(req, res, padId, type) res.send(dokuwiki); callback("stop"); }); - }, + } ], function(err) { if(err && err != "stop") throw err; @@ -80,8 +84,6 @@ exports.doExport = function(req, res, padId, type) else { var html; - var randNum; - var srcFile, destFile; async.series([ //render the html document @@ -92,7 +94,7 @@ exports.doExport = function(req, res, padId, type) if(ERR(err, callback)) return; html = _html; callback(); - }); + }); }, //decide what to do with the html export function(callback) @@ -101,13 +103,13 @@ exports.doExport = function(req, res, padId, type) if(type == "html") { res.send(html); - callback("stop"); + callback("stop"); } else //write the html export to a file { randNum = Math.floor(Math.random()*0xFFFFFFFF); srcFile = tempDirectory + "/eplite_export_" + randNum + ".html"; - fs.writeFile(srcFile, html, callback); + fs.writeFile(srcFile, html, callback); } }, //send the convert job to abiword @@ -115,7 +117,7 @@ exports.doExport = function(req, res, padId, type) { //ensure html can be collected by the garbage collector html = null; - + destFile = tempDirectory + "/eplite_export_" + randNum + "." + type; abiword.convertFile(srcFile, destFile, type, callback); }, @@ -137,7 +139,7 @@ exports.doExport = function(req, res, padId, type) //100ms delay to accomidate for slow windows fs if(os.type().indexOf("Windows") > -1) { - setTimeout(function() + setTimeout(function() { fs.unlink(destFile, callback); }, 100); @@ -152,6 +154,6 @@ exports.doExport = function(req, res, padId, type) ], function(err) { if(err && err != "stop") ERR(err); - }) + }); } };