diff --git a/node/server.js b/node/server.js index f4f3a371..422bbe12 100644 --- a/node/server.js +++ b/node/server.js @@ -123,19 +123,7 @@ async.waterfall([ }); //serve minified files - app.get('/minified/:id', function(req, res, next) - { - var id = req.params.id; - - if(id == "pad.js" || id == "timeslider.js") - { - minify.minifyJS(req,res,id); - } - else - { - next(); - } - }); + app.get('/minified/:filename', minify.minifyJS); //checks for padAccess function hasPadAccess(req, res, callback) diff --git a/node/utils/Minify.js b/node/utils/Minify.js index 3477cd01..da047bb2 100644 --- a/node/utils/Minify.js +++ b/node/utils/Minify.js @@ -40,20 +40,22 @@ var tar = JSON.parse(fs.readFileSync(TAR_PATH, 'utf8')); * @param req the Express request * @param res the Express response */ -exports.minifyJS = function(req, res, jsFilename) +exports.minifyJS = function(req, res, next) { - res.header("Content-Type","text/javascript"); + var jsFilename = req.params['filename']; //choose the js files we need var jsFiles = undefined; if (Object.prototype.hasOwnProperty.call(tar, jsFilename)) { jsFiles = tar[jsFilename]; } else { - throw new Error("there is no profile for creating " + name); + return next(); } var rootPath = path.normalize(__dirname + "/../../" ); + res.header("Content-Type","text/javascript"); + //minifying is enabled if(settings.minify) {