fixing issue where grunt wouldn't read js from file properly if nodebb wasn't run in production mode at least once

v1.18.x
Julian Lam 10 years ago
parent 6059165a54
commit 5d7b46935d

@ -209,17 +209,24 @@ module.exports = function(Meta) {
Meta.js.getFromFile = function(minify, callback) { Meta.js.getFromFile = function(minify, callback) {
var scriptPath = path.join(__dirname, '../../public/nodebb.min.js'), 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) { fs.exists(scriptPath, function(exists) {
if (exists) { if (exists) {
if (nconf.get('isPrimary') === 'true') { if (nconf.get('isPrimary') === 'true') {
winston.verbose('[meta/js] Reading client-side scripts from file'); fs.exists(mapPath, function(exists) {
async.map([scriptPath, mapPath], fs.readFile, function(err, files) { if (exists) {
Meta.js.cache = files[0]; paths.push(mapPath);
Meta.js.map = files[1]; }
emitter.emit('meta:js.compiled'); winston.verbose('[meta/js] Reading client-side scripts from file');
callback(); 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 { } else {
callback(); callback();

Loading…
Cancel
Save