removed file.exists from getFromFile

src/meta/js.js

@@ -6,7 +6,6 @@ var path = require('path');
 var async = require('async');
 var nconf = require('nconf');
 var fs = require('fs');
-var file = require('../file');
 var plugins = require('../plugins');
 var utils = require('../../public/src/utils');
 
@@ -217,35 +216,37 @@ module.exports = function (Meta) {
 	};
 
 	Meta.js.getFromFile = function (target, callback) {
-		var scriptPath = path.join(__dirname, '../../public/' + target),
+		function readFile(filePath, next) {
-			mapPath = path.join(__dirname, '../../public/' + target + '.map'),
+			fs.readFile(filePath, function (err, contents) {
-			paths = [scriptPath];
+				if (err) {
-
+					if (err.code === 'ENOENT') {
-		file.exists(scriptPath, function (exists) {
+						winston.warn('[meta/js] ' + filePath + ' not found on disk, did you run ./nodebb build?');
-			if (!exists) {
+						return next(null, '');
-				winston.warn('[meta/js] ' + target + ' not found on disk, re-minifying');
-				Meta.js.minify(target, callback);
-				return;
-			}
-
-			file.exists(mapPath, function (exists) {
-				if (exists) {
-					paths.push(mapPath);
-				}
-
-				async.map(paths, fs.readFile, function (err, files) {
-					if (err) {
-						return callback(err);
 					}
-
+				}
-					Meta.js.target[target] = {
+				next(err, contents);
-						cache: files[0],
-						map: files[1] || ''
-					};
-
-					callback();
-				});
 			});
+		}
+
+		var scriptPath = path.join(nconf.get('base_dir'), 'public/' + target);
+		var mapPath = path.join(nconf.get('base_dir'), 'public/' + target + '.map');
+
+		async.parallel({
+			script: function (next) {
+				readFile(scriptPath, next);
+			},
+			map: function (next) {
+				readFile(mapPath, next);
+			}
+		}, function (err, results) {
+			if (err) {
+				return callback(err);
+			}
+			Meta.js.target[target] = {
+				cache: results.script,
+				map: results.map
+			};
+			callback();
 		});
 	};