Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-31 11:05:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

#3875 filter:scripts.get now acts like filter:admin.scripts.get; does not get minified

Browse Source
This commit is contained in:
psychobunny
2016-01-18 15:32:49 -05:00
parent 9430a626f4
commit f94cd21f83
2 changed files with 31 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
src/meta/js.js
View File

@@ -141,44 +141,31 @@ module.exports = function(Meta) {
Meta.js.prepare = function(target, callback) { Meta.js.prepare = function(target, callback) {
var pluginsScripts = []; var pluginsScripts = [];
async.parallel([ var pluginDirectories = [];
function(next) {
if (target === 'nodebb.min.js') {
getPluginScripts(next);
} else {
next();
}
},
function(next) {
// client scripts via "scripts" config in plugin.json
var pluginDirectories = [];
pluginsScripts = plugins[target === 'nodebb.min.js' ? 'clientScripts' : 'acpScripts'].filter(function(path) { pluginsScripts = plugins[target === 'nodebb.min.js' ? 'clientScripts' : 'acpScripts'].filter(function(path) {
if (path.endsWith('.js')) { if (path.endsWith('.js')) {
return true; return true;
} else {
pluginDirectories.push(path);
return false;
}
});
async.each(pluginDirectories, function(directory, next) {
utils.walk(directory, function(err, scripts) {
pluginsScripts = pluginsScripts.concat(scripts);
next(err);
});
}, next);
} }
], function(err) {
pluginDirectories.push(path);
return false;
});
async.each(pluginDirectories, function(directory, next) {
utils.walk(directory, function(err, scripts) {
pluginsScripts = pluginsScripts.concat(scripts);
next(err);
});
}, function(err) {
if (err) { if (err) {
return callback(err); return callback(err);
} }
// Convert all scripts to paths relative to the NodeBB base directory
var basePath = path.resolve(__dirname, '../..'); var basePath = path.resolve(__dirname, '../..');
if (target === 'nodebb.min.js') { if (target === 'nodebb.min.js') {
Meta.js.target[target].scripts = Meta.js.scripts.base.concat(pluginsScripts, Meta.js.scripts.rjs, Meta.js.scripts.plugin); Meta.js.target[target].scripts = Meta.js.scripts.base.concat(pluginsScripts, Meta.js.scripts.rjs);
} else { } else {
Meta.js.target[target].scripts = pluginsScripts; Meta.js.target[target].scripts = pluginsScripts;
} }
@@ -244,38 +231,6 @@ module.exports = function(Meta) {
}); });
}; };
function getPluginScripts(callback) {
plugins.fireHook('filter:scripts.get', [], function(err, scripts) {
if (err) {
callback(err, []);
}
var jsPaths = scripts.map(function (jsPath) {
jsPath = path.normalize(jsPath);
var matches = _.map(plugins.staticDirs, function(realPath, mappedPath) {
if (jsPath.match(mappedPath)) {
return mappedPath;
} else {
return null;
}
}).filter(function(a) { return a; });
if (matches.length) {
var relPath = jsPath.slice(('plugins/' + matches[0]).length);
return plugins.staticDirs[matches[0]] + relPath;
} else {
winston.warn('[meta.scripts.get] Could not resolve mapped path: ' + jsPath + '. Are you sure it is defined by a plugin?');
return null;
}
});
Meta.js.scripts.plugin = jsPaths.filter(Boolean);
callback();
});
}
function setupDebugging() { function setupDebugging() {
/** /**
* Check if the parent process is running with the debug option --debug (or --debug-brk) * Check if the parent process is running with the debug option --debug (or --debug-brk)

15
src/middleware/header.js
View File

@@ -67,6 +67,19 @@ module.exports = function(app, middleware) {
templateValues.configJSON = JSON.stringify(res.locals.config); templateValues.configJSON = JSON.stringify(res.locals.config);
async.parallel({ async.parallel({
scripts: function(next) {
plugins.fireHook('filter:scripts.get', [], function(err, scripts) {
if (err) {
return next(err);
}
var arr = [];
scripts.forEach(function(script) {
arr.push({src: script});
});
next(null, arr);
});
},
isAdmin: function(next) { isAdmin: function(next) {
user.isAdministrator(req.uid, next); user.isAdministrator(req.uid, next);
}, },
@@ -121,6 +134,8 @@ module.exports = function(app, middleware) {
templateValues.template = {name: res.locals.template}; templateValues.template = {name: res.locals.template};
templateValues.template[res.locals.template] = true; templateValues.template[res.locals.template] = true;
templateValues.scripts = results.scripts;
if (req.route && req.route.path === '/') { if (req.route && req.route.path === '/') {
modifyTitle(templateValues); modifyTitle(templateValues);
} }