fuwafuwa
/
etherpad-lite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #593 from fourplusone/nicer_code 

Removing node.extend
This commit is contained in:
John McLear 2012-04-04 03:24:32 -07:00
parent 49593a1c8e 5a77979486
commit e387e25c05
2 changed files with 33 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/package.json
View File

@ -23,9 +23,8 @@
"log4js" : "0.4.1", "log4js" : "0.4.1",
"jsdom-nocontextifiy" : "0.2.10", "jsdom-nocontextifiy" : "0.2.10",
"async-stacktrace" : "0.0.2", "async-stacktrace" : "0.0.2",
"npm" : "1.1", "npm" : "1.1",
"ejs" : "0.6.1", "ejs" : "0.6.1",
"node.extend" : "1.0.0",
"graceful-fs" : "1.1.5", "graceful-fs" : "1.1.5",
"slide" : "1.1.3", "slide" : "1.1.3",
"semver" : "1.0.13", "semver" : "1.0.13",

62
src/static/js/pluginfw/plugins.js
View File

@ -12,10 +12,9 @@ if (!exports.isClient) {
var fs = require("fs"); var fs = require("fs");
var tsort = require("./tsort"); var tsort = require("./tsort");
var util = require("util"); var util = require("util");
var extend = require("node.extend");
_ = require("underscore"); _ = require("underscore");
}else{ }else{
var $, jQuery var $, jQuery;
$ = jQuery = require("ep_etherpad-lite/static/js/rjquery").$; $ = jQuery = require("ep_etherpad-lite/static/js/rjquery").$;
_ = require("ep_etherpad-lite/static/js/underscore"); _ = require("ep_etherpad-lite/static/js/underscore");
} }
@ -31,15 +30,15 @@ exports.ensure = function (cb) {
exports.update(cb); exports.update(cb);
else else
cb(); cb();
} };
exports.formatPlugins = function () { exports.formatPlugins = function () {
return _.keys(exports.plugins).join(", "); return _.keys(exports.plugins).join(", ");
} };
exports.formatParts = function () { exports.formatParts = function () {
return _.map(exports.parts, function (part) { return part.full_name; }).join("\n"); return _.map(exports.parts, function (part) { return part.full_name; }).join("\n");
} };
exports.formatHooks = function () { exports.formatHooks = function () {
var res = []; var res = [];
@ -49,7 +48,7 @@ exports.formatHooks = function () {
}); });
}); });
return res.join("\n"); return res.join("\n");
} };
exports.loadFn = function (path) { exports.loadFn = function (path) {
var x = path.split(":"); var x = path.split(":");
@ -58,7 +57,7 @@ exports.loadFn = function (path) {
fn = fn[name]; fn = fn[name];
}); });
return fn; return fn;
} };
exports.extractHooks = function (parts, hook_set_name) { exports.extractHooks = function (parts, hook_set_name) {
var hooks = {}; var hooks = {};
@ -70,12 +69,12 @@ exports.extractHooks = function (parts, hook_set_name) {
if (hook_fn) { if (hook_fn) {
hooks[hook_name].push({"hook_name": hook_name, "hook_fn": hook_fn, "hook_fn_name": hook_fn_name, "part": part}); hooks[hook_name].push({"hook_name": hook_name, "hook_fn": hook_fn, "hook_fn_name": hook_fn_name, "part": part});
} else { } else {
console.error("Unable to load hook function for " + part.full_name + " for hook " + hook_name + ": " + part.hooks[hook_name]); console.error("Unable to load hook function for " + part.full_name + " for hook " + hook_name + ": " + part.hooks[hook_name]);
} }
}); });
}); });
return hooks; return hooks;
} };
if (exports.isClient) { if (exports.isClient) {
@ -90,7 +89,7 @@ if (exports.isClient) {
console.error("Failed to load plugin-definitions: " + err); console.error("Failed to load plugin-definitions: " + err);
cb(); cb();
}); });
} };
} else { } else {
exports.update = function (cb) { exports.update = function (cb) {
@ -104,15 +103,15 @@ exports.update = function (cb) {
exports.loadPlugin(packages, plugin_name, plugins, parts, cb); exports.loadPlugin(packages, plugin_name, plugins, parts, cb);
}, },
function (err) { function (err) {
exports.plugins = plugins; exports.plugins = plugins;
exports.parts = exports.sortParts(parts); exports.parts = exports.sortParts(parts);
exports.hooks = exports.extractHooks(exports.parts, "hooks"); exports.hooks = exports.extractHooks(exports.parts, "hooks");
exports.loaded = true; exports.loaded = true;
cb(err); cb(err);
} }
); );
}); });
} };
exports.getPackages = function (cb) { exports.getPackages = function (cb) {
// Load list of installed NPM packages, flatten it to a list, and filter out only packages with names that // Load list of installed NPM packages, flatten it to a list, and filter out only packages with names that
@ -122,49 +121,50 @@ exports.getPackages = function (cb) {
var packages = {}; var packages = {};
function flatten(deps) { function flatten(deps) {
_.chain(deps).keys().each(function (name) { _.chain(deps).keys().each(function (name) {
if (name.indexOf(exports.prefix) == 0) { if (name.indexOf(exports.prefix) === 0) {
packages[name] = extend({}, deps[name]); packages[name] = _.clone(deps[name]);
// Delete anything that creates loops so that the plugin // Delete anything that creates loops so that the plugin
// list can be sent as JSON to the web client // list can be sent as JSON to the web client
delete packages[name].dependencies; delete packages[name].dependencies;
delete packages[name].parent; delete packages[name].parent;
} }
if (deps[name].dependencies !== undefined)
flatten(deps[name].dependencies); 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);
cb(null, packages); cb(null, packages);
}); });
} };
exports.loadPlugin = function (packages, plugin_name, plugins, parts, cb) { exports.loadPlugin = function (packages, plugin_name, plugins, parts, cb) {
var plugin_path = path.resolve(packages[plugin_name].path, "ep.json"); var plugin_path = path.resolve(packages[plugin_name].path, "ep.json");
fs.readFile( fs.readFile(
plugin_path, plugin_path,
function (er, data) { function (er, data) {
if (er) { if (er) {
console.error("Unable to load plugin definition file " + plugin_path); console.error("Unable to load plugin definition file " + plugin_path);
return cb(); return cb();
} }
try { try {
var plugin = JSON.parse(data); var plugin = JSON.parse(data);
plugin.package = packages[plugin_name]; plugin['package'] = packages[plugin_name];
plugins[plugin_name] = plugin; plugins[plugin_name] = plugin;
_.each(plugin.parts, function (part) { _.each(plugin.parts, function (part) {
part.plugin = plugin_name; part.plugin = plugin_name;
part.full_name = plugin_name + "/" + part.name; part.full_name = plugin_name + "/" + part.name;
parts[part.full_name] = part; parts[part.full_name] = part;
}); });
} catch (ex) { } catch (ex) {
console.error("Unable to parse plugin definition file " + plugin_path + ": " + ex.toString()); console.error("Unable to parse plugin definition file " + plugin_path + ": " + ex.toString());
} }
cb(); cb();
} }
); );
} };
exports.partsToParentChildList = function (parts) { exports.partsToParentChildList = function (parts) {
var res = []; var res = [];
@ -180,7 +180,7 @@ exports.partsToParentChildList = function (parts) {
} }
}); });
return res; return res;
} };
// Used only in Node, so no need for _ // Used only in Node, so no need for _