libretic
/
etherpad-lite
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Inject special normalization behavior.

This commit is contained in:
Chad Weider 2012-05-28 18:33:03 -07:00
parent e375b6212a
commit 3631f0ece3
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -76,7 +76,7 @@ function loadFn(path, hookName) {
return fn; return fn;
}; };
exports.extractHooks = function (parts, hook_set_name) { function extractHooks(parts, hook_set_name, normalizer) {
var hooks = {}; var hooks = {};
_.each(parts,function (part) { _.each(parts,function (part) {
_.chain(part[hook_set_name] || {}) _.chain(part[hook_set_name] || {})
@ -90,8 +90,8 @@ exports.extractHooks = function (parts, hook_set_name) {
* require("pluginname/whatever") if the plugin is installed as * require("pluginname/whatever") if the plugin is installed as
* a dependency of another plugin! Bah, pesky little details of * a dependency of another plugin! Bah, pesky little details of
* npm... */ * npm... */
if (!exports.isClient) { if (normalizer) {
hook_fn_name = path.normalize(path.join(path.dirname(exports.plugins[part.plugin].package.path), hook_fn_name)); hook_fn_name = normalizer(part, hook_fn_name);
} }
try { try {
@ -121,7 +121,7 @@ if (exports.isClient) {
jQuery.getJSON(exports.baseURL + 'pluginfw/plugin-definitions.json', function(data) { jQuery.getJSON(exports.baseURL + 'pluginfw/plugin-definitions.json', function(data) {
exports.plugins = data.plugins; exports.plugins = data.plugins;
exports.parts = data.parts; exports.parts = data.parts;
exports.hooks = exports.extractHooks(exports.parts, "client_hooks"); exports.hooks = extractHooks(exports.parts, "client_hooks");
exports.loaded = true; exports.loaded = true;
callback(); callback();
}).error(function(xhr, s, err){ }).error(function(xhr, s, err){
@ -153,6 +153,10 @@ exports.callInit = function (cb) {
); );
} }
exports.pathNormalization = function (part, hook_fn_name) {
return path.normalize(path.join(path.dirname(exports.plugins[part.plugin].package.path), hook_fn_name));
}
exports.update = function (cb) { exports.update = function (cb) {
exports.getPackages(function (er, packages) { exports.getPackages(function (er, packages) {
var parts = []; var parts = [];
@ -167,7 +171,7 @@ exports.update = function (cb) {
if (err) cb(err); if (err) cb(err);
exports.plugins = plugins; exports.plugins = plugins;
exports.parts = sortParts(parts); exports.parts = sortParts(parts);
exports.hooks = exports.extractHooks(exports.parts, "hooks"); exports.hooks = exports.extractHooks(exports.parts, "hooks", exports.pathNormalization);
exports.loaded = true; exports.loaded = true;
exports.callInit(cb); exports.callInit(cb);
} }