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

fix dupe code

Browse Source
This commit is contained in:
barisusakli
2016-12-23 15:58:40 +03:00
parent 306687ccaa
commit 4943832dd8
1 changed files with 12 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/plugins/load.js
View File

@@ -43,7 +43,7 @@ module.exports = function (Plugins) {
Plugins.lessFiles.length = 0;
Plugins.clientScripts.length = 0;
Plugins.acpScripts.length = 0;
async.waterfall([
async.apply(Plugins.getPluginPaths),
function (paths, next) {
@@ -195,25 +195,19 @@ module.exports = function (Plugins) {
}
function mapClientSideScripts(pluginData, callback) {
if (Array.isArray(pluginData.scripts)) {
if (global.env === 'development') {
winston.verbose('[plugins] Found ' + pluginData.scripts.length + ' js file(s) for plugin ' + pluginData.id);
function mapScripts(scripts, globalScripts) {
if (Array.isArray(scripts) && scripts.length) {
if (global.env === 'development') {
winston.verbose('[plugins] Found ' + scripts.length + ' js file(s) for plugin ' + pluginData.id);
}
globalScripts = globalScripts.concat(scripts.map(function (file) {
return resolveModulePath(path.join(__dirname, '../../node_modules/', pluginData.id, file), file);
})).filter(Boolean);
}
Plugins.clientScripts = Plugins.clientScripts.concat(pluginData.scripts.map(function (file) {
return resolveModulePath(path.join(__dirname, '../../node_modules/', pluginData.id, file), file);
})).filter(Boolean);
}
if (Array.isArray(pluginData.acpScripts)) {
if (global.env === 'development') {
winston.verbose('[plugins] Found ' + pluginData.acpScripts.length + ' ACP js file(s) for plugin ' + pluginData.id);
}
Plugins.acpScripts = Plugins.acpScripts.concat(pluginData.acpScripts.map(function (file) {
return resolveModulePath(path.join(__dirname, '../../node_modules/', pluginData.id, file), file);
})).filter(Boolean);
}
mapScripts(pluginData.scripts, Plugins.clientScripts);
mapScripts(pluginData.acpScripts, Plugins.acpScripts);
callback();
}