From 5d7b46935d1ffc59286f3c1bbfc3920356e4c9f4 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Wed, 4 Mar 2015 17:17:54 -0500 Subject: [PATCH] fixing issue where grunt wouldn't read js from file properly if nodebb wasn't run in production mode at least once --- src/meta/js.js | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/src/meta/js.js b/src/meta/js.js index b8fa903c12..26e8f497ae 100644 --- a/src/meta/js.js +++ b/src/meta/js.js @@ -209,17 +209,24 @@ module.exports = function(Meta) { Meta.js.getFromFile = function(minify, callback) { var scriptPath = path.join(__dirname, '../../public/nodebb.min.js'), - mapPath = path.join(__dirname, '../../public/nodebb.min.js.map'); + mapPath = path.join(__dirname, '../../public/nodebb.min.js.map'), + paths = [scriptPath]; fs.exists(scriptPath, function(exists) { if (exists) { if (nconf.get('isPrimary') === 'true') { - winston.verbose('[meta/js] Reading client-side scripts from file'); - async.map([scriptPath, mapPath], fs.readFile, function(err, files) { - Meta.js.cache = files[0]; - Meta.js.map = files[1]; + fs.exists(mapPath, function(exists) { + if (exists) { + paths.push(mapPath); + } - emitter.emit('meta:js.compiled'); - callback(); + winston.verbose('[meta/js] Reading client-side scripts from file'); + async.map(paths, fs.readFile, function(err, files) { + Meta.js.cache = files[0]; + Meta.js.map = files[1] || ''; + + emitter.emit('meta:js.compiled'); + callback(); + }); }); } else { callback();