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

Merge pull request #556 from fourplusone/feature_jquery

Browse source 
added jQuery to ace2_inner, make it embeddable, ace hooks work now propertly in ace2_inner
This commit is contained in:
John McLear 2012-03-26 08:10:58 -07:00
commit beec69ac1c
17 changed files with 1187 additions and 337 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/static/js/pluginfw/hooks.js
View file

@ -1,10 +1,13 @@
var plugins = require("ep_etherpad-lite/static/js/pluginfw/plugins");
var _;
/* FIXME: Ugly hack, in the future, use same code for server & client */
if (plugins.isClient) {
var async = require("ep_etherpad-lite/static/js/pluginfw/async");
var async = require("ep_etherpad-lite/static/js/pluginfw/async");
_ = require("ep_etherpad-lite/static/js/underscore");
} else {
var async = require("async");
_ = require("underscore");
}
var hookCallWrapper = function (hook, hook_name, args, cb) {
@ -34,7 +37,7 @@ exports.flatten = function (lst) {
exports.callAll = function (hook_name, args) {
if (plugins.hooks[hook_name] === undefined) return [];
return exports.flatten(plugins.hooks[hook_name].map(function (hook) {
return exports.flatten(_.map(plugins.hooks[hook_name], function (hook) {
return hookCallWrapper(hook, hook_name, args);
}));
}

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

@ -1,5 +1,7 @@
exports.isClient = typeof global != "object";
var _;
if (!exports.isClient) {
var npm = require("npm/lib/npm.js");
var readInstalled = require("npm/lib/utils/read-installed.js");
@ -10,6 +12,12 @@ if (!exports.isClient) {
var fs = require("fs");
var tsort = require("./tsort");
var util = require("util");
_ = require("underscore");
}else{
var $, jQuery
$ = jQuery = require("ep_etherpad-lite/static/js/rjquery").$;
_ = require("ep_etherpad-lite/static/js/underscore");
}
exports.prefix = 'ep_';
@ -26,17 +34,17 @@ exports.ensure = function (cb) {
}
exports.formatPlugins = function () {
return Object.keys(exports.plugins).join(", ");
return _.keys(exports.plugins).join(", ");
}
exports.formatParts = function () {
return exports.parts.map(function (part) { return part.full_name; }).join("\n");
return _.map(exports.parts, function (part) { return part.full_name; }).join("\n");
}
exports.formatHooks = function () {
var res = [];
Object.keys(exports.hooks).forEach(function (hook_name) {
exports.hooks[hook_name].forEach(function (hook) {
_.chain(exports.hooks).keys().forEach(function (hook_name) {
_.forEach(exports.hooks[hook_name], function (hook) {
res.push(hook.hook_name + ": " + hook.hook_fn_name + " from " + hook.part.full_name);
});
});
@ -46,7 +54,7 @@ exports.formatHooks = function () {
exports.loadFn = function (path) {
var x = path.split(":");
var fn = require(x[0]);
x[1].split(".").forEach(function (name) {
_.each(x[1].split("."), function (name) {
fn = fn[name];
});
return fn;
@ -54,8 +62,8 @@ exports.loadFn = function (path) {
exports.extractHooks = function (parts, hook_set_name) {
var hooks = {};
parts.forEach(function (part) {
Object.keys(part[hook_set_name] || {}).forEach(function (hook_name) {
_.each(parts,function (part) {
_.chain(part[hook_set_name] || {}).keys().each(function (hook_name) {
if (hooks[hook_name] === undefined) hooks[hook_name] = [];
var hook_fn_name = part[hook_set_name][hook_name];
var hook_fn = exports.loadFn(part[hook_set_name][hook_name]);
@ -113,7 +121,7 @@ exports.getPackages = function (cb) {
if (er) cb(er, null);
var packages = {};
function flatten(deps) {
Object.keys(deps).forEach(function (name) {
_.chain(deps).keys().each(function (name) {
if (name.indexOf(exports.prefix) == 0) {
packages[name] = deps[name];
}
@ -140,7 +148,7 @@ exports.loadPlugin = function (packages, plugin_name, plugins, parts, cb) {
var plugin = JSON.parse(data);
plugin.package = packages[plugin_name];
plugins[plugin_name] = plugin;
plugin.parts.forEach(function (part) {
_.each(plugin.parts, function (part) {
part.plugin = plugin_name;
part.full_name = plugin_name + "/" + part.name;
parts[part.full_name] = part;
@ -155,11 +163,11 @@ exports.loadPlugin = function (packages, plugin_name, plugins, parts, cb) {
exports.partsToParentChildList = function (parts) {
var res = [];
Object.keys(parts).forEach(function (name) {
(parts[name].post || []).forEach(function (child_name) {
_.chain(parts).keys().forEach(function (name) {
_.each(parts[name].post || [], function (child_name) {
res.push([name, child_name]);
});
(parts[name].pre || []).forEach(function (parent_name) {
_.each(parts[name].pre || [], function (parent_name) {
res.push([parent_name, name]);
});
if (!parts[name].pre && !parts[name].post) {
@ -169,6 +177,8 @@ exports.partsToParentChildList = function (parts) {
return res;
}
// Used only in Node, so no need for _
exports.sortParts = function(parts) {
return tsort(
exports.partsToParentChildList(parts)