mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-20 23:46:14 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Updated npm to 4.0.2 and removed recursive searching for ep-plugins

Browse source
This commit is contained in:
Stefan 2016-11-20 11:28:17 +01:00
parent 602fd4629a
commit 00c9caf7a3
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/package.json
View file

@ -28,7 +28,7 @@
"log4js" : "0.6.35", "log4js" : "0.6.35",
"cheerio" : "0.20.0", "cheerio" : "0.20.0",
"async-stacktrace" : "0.0.2", "async-stacktrace" : "0.0.2",
"npm" : "2.7.6", "npm" : "4.0.2",
"ejs" : "2.4.1", "ejs" : "2.4.1",
"graceful-fs" : "4.1.3", "graceful-fs" : "4.1.3",
"slide" : "1.1.6", "slide" : "1.1.6",

5
src/static/js/pluginfw/plugins.js
View file

@ -117,13 +117,14 @@ exports.getPackages = function (cb) {
delete packages[name].parent; delete packages[name].parent;
} }
if (deps[name].dependencies !== undefined) flatten(deps[name].dependencies); // I don't think we need recursion
//if (deps[name].dependencies !== undefined) flatten(deps[name].dependencies);
}); });
} }
var tmp = {}; var tmp = {};
tmp[data.name] = data; tmp[data.name] = data;
flatten(tmp); flatten(tmp[undefined].dependencies);
cb(null, packages); cb(null, packages);
}); });
}; };