mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-28 11:26:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Hook modules can be in either CommonJS or AMD format, have to be AMD for client side

Browse source
This commit is contained in:
Egil Moeller 2015-04-11 16:51:01 +02:00
parent 0e5cd65d8d
commit b86aa5d858
6 changed files with 94 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -6,6 +6,7 @@ var fs = require("fs");
var tsort = require("./tsort");
var util = require("util");
var _ = require("underscore");
var requirejs = require('requirejs');
var pluginUtils = require('./shared');
@ -17,7 +18,22 @@ exports.hooks = {};
exports.ensure = function (cb) {
if (!exports.loaded)
exports.update(cb);
exports.getPackages(function (er, packages) {
pkg = Object.keys(packages).map(function (name) {
return {
name: name,
location: packages[name].realPath
}
})
;
console.log(["AAAAAAAAA", pkg]);
requirejs.config({
packages: pkg
});
exports.update(cb);
});
else
cb();
};
@ -32,7 +48,7 @@ exports.formatParts = function () {
exports.formatHooks = function (hook_set_name) {
var res = [];
var hooks = pluginUtils.extractHooks(exports.parts, hook_set_name || "hooks");
var hooks = exports[hook_set_name || "hooks"];
_.chain(hooks).keys().forEach(function (hook_name) {
_.forEach(hooks[hook_name], function (hook) {
@ -82,9 +98,15 @@ exports.update = function (cb) {
if (err) cb(err);
exports.plugins = plugins;
exports.parts = sortParts(parts);
exports.hooks = pluginUtils.extractHooks(exports.parts, "hooks", exports.pathNormalization);
exports.loaded = true;
exports.callInit(cb);
pluginUtils.extractHooks(exports.parts, "hooks", exports.pathNormalization, function (err, hooks) {
exports.hooks = hooks;
// Load client side hooks here too, so we don't have to call it from formatHooks (which is synchronous)
pluginUtils.extractHooks(exports.parts, "client_hooks", exports.pathNormalization, function (err, hooks) {
exports.client_hooks = hooks;
exports.loaded = true;
exports.callInit(cb);
});
});
}
);
});