From b4b00260680c9ecf6d7a65393d17234d9269eb72 Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Fri, 24 Feb 2012 13:42:36 +0100 Subject: [PATCH 001/297] Added the basic parts for a plugin loader --- node/pluginfw/plugins.js | 82 ++++++++++++++++++++++++++++ node/pluginfw/tsort.js | 112 +++++++++++++++++++++++++++++++++++++++ package.json | 3 +- 3 files changed, 196 insertions(+), 1 deletion(-) create mode 100644 node/pluginfw/plugins.js create mode 100644 node/pluginfw/tsort.js diff --git a/node/pluginfw/plugins.js b/node/pluginfw/plugins.js new file mode 100644 index 00000000..39cdffa6 --- /dev/null +++ b/node/pluginfw/plugins.js @@ -0,0 +1,82 @@ +var npm = require("npm/lib/npm.js"); +var readInstalled = require("npm/lib/utils/read-installed.js"); +var relativize = require("npm/lib/utils/relativize.js"); +var readJson = require("npm/lib/utils/read-json.js"); +var path = require("path"); +var async = require("async"); +var fs = require("fs"); +var tsort = require("./tsort"); + +var PLUGIN_PREFIX = 'pluginomatic_'; + +exports.getPlugins = function (cb, prefix) { + prefix = prefix || PLUGIN_PREFIX; + + // Load list of installed NPM packages, flatten it to a list, and filter out only packages with names that + // ../.. and not just .. because current dir is like ETHERPAD_ROOT/node/node_modules (!!!!) + var dir = path.resolve(npm.dir, "../..") + readInstalled(dir, function (er, data) { + var plugins = {}; + var parts = {}; + function flatten(deps) { + Object.keys(deps).forEach(function (name) { + if (name.indexOf(prefix) == 0) { + plugins[name] = deps[name]; + } + if (deps[name].dependencies !== undefined) + flatten(deps[name].dependencies); + }); + } + flatten([data]); + + // Load plugin metadata pluginomatic.json + async.forEach( + Object.keys(plugins), + function (plugin_name, cb) { + fs.readFile( + path.resolve(plugins[plugin_name].path, "pluginomatic.json"), + function (er, data) { + plugin = JSON.parse(data); + plugin.package = plugins[plugin_name]; + plugins[plugin_name] = plugin; + plugin.parts.forEach(function (part) { + part.plugin = plugin; + part.full_name = plugin_name + "." + part.name; + parts[part.full_name] = part; + }); + cb(); + } + ); + }, + function (err) { + cb(err, plugins, exports.sortParts(parts)); + } + ); + }); +} + +exports.partsToParentChildList = function (parts) { + var res = []; + Object.keys(parts).forEach(function (name) { + (parts[name].post || []).forEach(function (child_name) { + res.push([name, child_name]); + }); + (parts[name].pre || []).forEach(function (parent_name) { + res.push([parent_name, name]); + }); + if (!parts[name].pre && !parts[name].post) { + res.push([name, ":" + name]); // Include apps with no dependency info + } + }); + return res; +} + +exports.sortParts = function(parts) { + return tsort( + exports.partsToParentChildList(parts) + ).filter( + function (name) { return parts[name] !== undefined; } + ).map( + function (name) { return parts[name]; } + ); +}; diff --git a/node/pluginfw/tsort.js b/node/pluginfw/tsort.js new file mode 100644 index 00000000..6591c51c --- /dev/null +++ b/node/pluginfw/tsort.js @@ -0,0 +1,112 @@ +/** + * general topological sort + * from https://gist.github.com/1232505 + * @author SHIN Suzuki (shinout310@gmail.com) + * @param Array edges : list of edges. each edge forms Array e.g. [12 , 3] + * + * @returns Array : topological sorted list of IDs + **/ + +function tsort(edges) { + var nodes = {}, // hash: stringified id of the node => { id: id, afters: lisf of ids } + sorted = [], // sorted list of IDs ( returned value ) + visited = {}; // hash: id of already visited node => true + + var Node = function(id) { + this.id = id; + this.afters = []; + } + + // 1. build data structures + edges.forEach(function(v) { + var from = v[0], to = v[1]; + if (!nodes[from]) nodes[from] = new Node(from); + if (!nodes[to]) nodes[to] = new Node(to); + nodes[from].afters.push(to); + }); + + // 2. topological sort + Object.keys(nodes).forEach(function visit(idstr, ancestors) { + var node = nodes[idstr], + id = node.id; + + // if already exists, do nothing + if (visited[idstr]) return; + + if (!Array.isArray(ancestors)) ancestors = []; + + ancestors.push(id); + + visited[idstr] = true; + + node.afters.forEach(function(afterID) { + if (ancestors.indexOf(afterID) >= 0) // if already in ancestors, a closed chain exists. + throw new Error('closed chain : ' + afterID + ' is in ' + id); + + visit(afterID.toString(), ancestors.map(function(v) { return v })); // recursive call + }); + + sorted.unshift(id); + }); + + return sorted; +} + +/** + * TEST + **/ +function tsortTest() { + + // example 1: success + var edges = [ + [1, 2], + [1, 3], + [2, 4], + [3, 4] + ]; + + var sorted = tsort(edges); + console.log(sorted); + + // example 2: failure ( A > B > C > A ) + edges = [ + ['A', 'B'], + ['B', 'C'], + ['C', 'A'] + ]; + + try { + sorted = tsort(edges); + } + catch (e) { + console.log(e.message); + } + + // example 3: generate random edges + var max = 100, iteration = 30; + function randomInt(max) { + return Math.floor(Math.random() * max) + 1; + } + + edges = (function() { + var ret = [], i = 0; + while (i++ < iteration) ret.push( [randomInt(max), randomInt(max)] ); + return ret; + })(); + + try { + sorted = tsort(edges); + console.log("succeeded", sorted); + } + catch (e) { + console.log("failed", e.message); + } + +} + + +// for node.js +if (typeof exports == 'object' && exports === this) { + module.exports = tsort; + if (process.argv[1] === __filename) tsortTest(); +} diff --git a/package.json b/package.json index 27b2125a..940bf0a4 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,8 @@ "formidable" : "1.0.7", "log4js" : "0.4.1", "jsdom-nocontextifiy" : "0.2.10", - "async-stacktrace" : "0.0.2" + "async-stacktrace" : "0.0.2", + "npm" : "1.1", }, "devDependencies": { "jshint" : "*" From e994b5b2b1e3a5fa71ed7867fda3c2b3c0856cb0 Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Fri, 24 Feb 2012 15:33:20 +0100 Subject: [PATCH 002/297] Oups, bad format --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 940bf0a4..b8241450 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "log4js" : "0.4.1", "jsdom-nocontextifiy" : "0.2.10", "async-stacktrace" : "0.0.2", - "npm" : "1.1", + "npm" : "1.1" }, "devDependencies": { "jshint" : "*" From e5a46f585018e5f49bd6bb1f8d9384584bfc14d3 Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Fri, 24 Feb 2012 17:37:40 +0100 Subject: [PATCH 003/297] Added hook.callAll and hook.aCallAll --- node/pluginfw/hooks.js | 46 ++++++++++++++++++++++++++++++++++++ node/pluginfw/plugins.js | 50 +++++++++++++++++++++++++++++++++++----- 2 files changed, 90 insertions(+), 6 deletions(-) create mode 100644 node/pluginfw/hooks.js diff --git a/node/pluginfw/hooks.js b/node/pluginfw/hooks.js new file mode 100644 index 00000000..d284b229 --- /dev/null +++ b/node/pluginfw/hooks.js @@ -0,0 +1,46 @@ +var plugins = require("./plugins"); +var async = require("async"); + + +/* Don't use Array.concat as it flatterns arrays within the array */ +exports.flatten = function (lst) { + var res = []; + if (lst != undefined && lst != null) { + for (var i = 0; i < lst.length; i++) { + if (lst[i] != undefined && lst[i] != null) { + for (var j = 0; j < lst[i].length; j++) { + res.push(lst[i][j]); + } + } + } + } + return res; +} + +exports.callAll = function (hook_name, args) { + return exports.flatten(plugins.hooks[hook_name].map(function (hook) { + return hook.hook(hook_name, args, function (x) { return x; }); + })); +} + +exports.aCallAll = function (hook_name, args, cb) { + async.map( + plugins.hooks[hook_name], + function (hook, cb) { + hook.hook(hook_name, args, function (res) { cb(null, res); }); + }, + function (err, res) { + cb(exports.flatten(res)); + } + ); +} + +exports.callFirst = function (hook_name, args) { + if (plugins.hooks[hook_name][0] === undefined) return []; + return exports.flatten(plugins.hooks[hook_name][0].hook(hook_name, args, function (x) { return x; })); +} + +exports.aCallFirst = function (hook_name, args, cb) { + if (plugins.hooks[hook_name][0] === undefined) cb([]); + plugins.hooks[hook_name][0].hook(hook_name, args, function (res) { cb(exports.flatten(res)); }); +} diff --git a/node/pluginfw/plugins.js b/node/pluginfw/plugins.js index 39cdffa6..910e0028 100644 --- a/node/pluginfw/plugins.js +++ b/node/pluginfw/plugins.js @@ -7,11 +7,39 @@ var async = require("async"); var fs = require("fs"); var tsort = require("./tsort"); -var PLUGIN_PREFIX = 'pluginomatic_'; +exports.prefix = 'pluginomatic_'; +exports.loaded = false; +exports.plugins = {}; +exports.parts = []; +exports.hooks = {}; -exports.getPlugins = function (cb, prefix) { - prefix = prefix || PLUGIN_PREFIX; +exports.ensure = function (cb) { + if (!exports.loaded) + exports.update(cb); + else + cb(); +} +exports.update = function (cb) { + exports.getPlugins(function (er, plugins, parts, hooks) { + exports.plugins = plugins; + exports.parts = parts; + exports.hooks = hooks; + exports.loaded = true; + cb(er); + }); +} + +exports.loadFn = function (path) { + var x = path.split(":"); + var fn = require(x[0]); + x[1].split(".").forEach(function (name) { + fn = fn[name]; + }); + return fn; +} + +exports.getPlugins = function (cb) { // Load list of installed NPM packages, flatten it to a list, and filter out only packages with names that // ../.. and not just .. because current dir is like ETHERPAD_ROOT/node/node_modules (!!!!) var dir = path.resolve(npm.dir, "../..") @@ -20,7 +48,7 @@ exports.getPlugins = function (cb, prefix) { var parts = {}; function flatten(deps) { Object.keys(deps).forEach(function (name) { - if (name.indexOf(prefix) == 0) { + if (name.indexOf(exports.prefix) == 0) { plugins[name] = deps[name]; } if (deps[name].dependencies !== undefined) @@ -41,7 +69,7 @@ exports.getPlugins = function (cb, prefix) { plugins[plugin_name] = plugin; plugin.parts.forEach(function (part) { part.plugin = plugin; - part.full_name = plugin_name + "." + part.name; + part.full_name = plugin_name + "/" + part.name; parts[part.full_name] = part; }); cb(); @@ -49,7 +77,17 @@ exports.getPlugins = function (cb, prefix) { ); }, function (err) { - cb(err, plugins, exports.sortParts(parts)); + parts = exports.sortParts(parts); + var hooks = {}; + parts.forEach(function (part) { + Object.keys(part.hooks || {}).forEach(function (hook_name) { + if (hooks[hook_name] === undefined) hooks[hook_name] = []; + var hook_fn_name = part.hooks[hook_name]; + + hooks[hook_name].push({"hook": exports.loadFn(part.hooks[hook_name]), "part": part}); + }); + }); + cb(err, plugins, parts, hooks); } ); }); From 38e62274bc7bce9755d655125b7bb2d106085fea Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Fri, 24 Feb 2012 17:59:14 +0100 Subject: [PATCH 004/297] Added expressServer hook to register new URLs --- node/server.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/node/server.js b/node/server.js index a6a57497..804a1ad8 100644 --- a/node/server.js +++ b/node/server.js @@ -32,6 +32,8 @@ var express = require('express'); var path = require('path'); var minify = require('./utils/Minify'); var formidable = require('formidable'); +var plugins = require("./pluginfw/plugins"); +var hooks = require("./pluginfw/hooks"); var apiHandler; var exportHandler; var importHandler; @@ -68,6 +70,8 @@ exports.maxAge = 1000*60*60*6; log4js.setGlobalLogLevel(settings.loglevel); async.waterfall([ + plugins.update, + //initalize the database function (callback) { @@ -79,6 +83,8 @@ async.waterfall([ //create server var app = express.createServer(); + hooks.callAll("expressServer", {"app": app}); + app.use(function (req, res, next) { res.header("Server", serverName); next(); From 168f4819800450807f2f189fb714df5684328be9 Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Fri, 24 Feb 2012 19:02:56 +0100 Subject: [PATCH 005/297] Restructuring of some code to make it more readable --- node/pluginfw/plugins.js | 102 ++++++++++++++++++++++----------------- 1 file changed, 58 insertions(+), 44 deletions(-) diff --git a/node/pluginfw/plugins.js b/node/pluginfw/plugins.js index 910e0028..2eb4d8e3 100644 --- a/node/pluginfw/plugins.js +++ b/node/pluginfw/plugins.js @@ -30,69 +30,74 @@ exports.update = function (cb) { }); } -exports.loadFn = function (path) { - var x = path.split(":"); - var fn = require(x[0]); - x[1].split(".").forEach(function (name) { - fn = fn[name]; +exports.getPlugins = function (cb) { + exports.getPackages(function (er, packages) { + var parts = {}; + var plugins = {}; + // Load plugin metadata pluginomatic.json + async.forEach( + Object.keys(packages), + function (plugin_name, cb) { + exports.loadPlugin(packages, plugin_name, plugins, parts, cb); + }, + function (err) { + parts = exports.sortParts(parts); + var hooks = exports.extractHooks(parts); + cb(err, plugins, parts, hooks); + } + ); }); - return fn; } -exports.getPlugins = 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 // ../.. and not just .. because current dir is like ETHERPAD_ROOT/node/node_modules (!!!!) var dir = path.resolve(npm.dir, "../..") readInstalled(dir, function (er, data) { - var plugins = {}; - var parts = {}; + if (er) cb(er, null); + var packages = {}; function flatten(deps) { Object.keys(deps).forEach(function (name) { if (name.indexOf(exports.prefix) == 0) { - plugins[name] = deps[name]; + packages[name] = deps[name]; } if (deps[name].dependencies !== undefined) flatten(deps[name].dependencies); }); } flatten([data]); - - // Load plugin metadata pluginomatic.json - async.forEach( - Object.keys(plugins), - function (plugin_name, cb) { - fs.readFile( - path.resolve(plugins[plugin_name].path, "pluginomatic.json"), - function (er, data) { - plugin = JSON.parse(data); - plugin.package = plugins[plugin_name]; - plugins[plugin_name] = plugin; - plugin.parts.forEach(function (part) { - part.plugin = plugin; - part.full_name = plugin_name + "/" + part.name; - parts[part.full_name] = part; - }); - cb(); - } - ); - }, - function (err) { - parts = exports.sortParts(parts); - var hooks = {}; - parts.forEach(function (part) { - Object.keys(part.hooks || {}).forEach(function (hook_name) { - if (hooks[hook_name] === undefined) hooks[hook_name] = []; - var hook_fn_name = part.hooks[hook_name]; - - hooks[hook_name].push({"hook": exports.loadFn(part.hooks[hook_name]), "part": part}); - }); - }); - cb(err, plugins, parts, hooks); - } - ); + cb(null, packages); }); } +exports.extractHooks = function (parts) { + var hooks = {}; + parts.forEach(function (part) { + Object.keys(part.hooks || {}).forEach(function (hook_name) { + if (hooks[hook_name] === undefined) hooks[hook_name] = []; + var hook_fn_name = part.hooks[hook_name]; + hooks[hook_name].push({"hook": exports.loadFn(part.hooks[hook_name]), "part": part}); + }); + }); + return hooks; +} + +exports.loadPlugin = function (packages, plugin_name, plugins, parts, cb) { + fs.readFile( + path.resolve(packages[plugin_name].path, "pluginomatic.json"), + function (er, data) { + var plugin = JSON.parse(data); + plugin.package = packages[plugin_name]; + plugin.parts.forEach(function (part) { + part.plugin = plugin; + part.full_name = plugin_name + "/" + part.name; + parts[part.full_name] = part; + }); + cb(); + } + ); +} + exports.partsToParentChildList = function (parts) { var res = []; Object.keys(parts).forEach(function (name) { @@ -118,3 +123,12 @@ exports.sortParts = function(parts) { function (name) { return parts[name]; } ); }; + +exports.loadFn = function (path) { + var x = path.split(":"); + var fn = require(x[0]); + x[1].split(".").forEach(function (name) { + fn = fn[name]; + }); + return fn; +} From 30b018833c3e3ab7092fe5bea96f02d5fec9e292 Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Fri, 24 Feb 2012 20:03:58 +0100 Subject: [PATCH 006/297] Added a simple test plugin that doesn't do much --- .../pluginomatic_fintest/.npmignore | 7 ++++ .../pluginomatic_fintest/otherpart.js | 13 ++++++++ .../pluginomatic_fintest/package.json | 9 ++++++ .../pluginomatic_fintest/partlast.js | 3 ++ .../pluginomatic_fintest/pluginomatic.json | 32 +++++++++++++++++++ 5 files changed, 64 insertions(+) create mode 100644 available_plugins/pluginomatic_fintest/.npmignore create mode 100644 available_plugins/pluginomatic_fintest/otherpart.js create mode 100644 available_plugins/pluginomatic_fintest/package.json create mode 100644 available_plugins/pluginomatic_fintest/partlast.js create mode 100644 available_plugins/pluginomatic_fintest/pluginomatic.json diff --git a/available_plugins/pluginomatic_fintest/.npmignore b/available_plugins/pluginomatic_fintest/.npmignore new file mode 100644 index 00000000..74bd365b --- /dev/null +++ b/available_plugins/pluginomatic_fintest/.npmignore @@ -0,0 +1,7 @@ +.git* +docs/ +examples/ +support/ +test/ +testing.js +.DS_Store diff --git a/available_plugins/pluginomatic_fintest/otherpart.js b/available_plugins/pluginomatic_fintest/otherpart.js new file mode 100644 index 00000000..f2a94d35 --- /dev/null +++ b/available_plugins/pluginomatic_fintest/otherpart.js @@ -0,0 +1,13 @@ +exports.somehook = function (hook_name, args, cb) { + return cb(["otherpart:somehook was here"]); +} + +exports.morehook = function (hook_name, args, cb) { + return cb(["otherpart:morehook was here"]); +} + +exports.expressServer = function (hook_name, args, cb) { + args.app.get('/otherpart', function(req, res) { + res.send("Abra cadabra"); + }); +} diff --git a/available_plugins/pluginomatic_fintest/package.json b/available_plugins/pluginomatic_fintest/package.json new file mode 100644 index 00000000..d5b0531b --- /dev/null +++ b/available_plugins/pluginomatic_fintest/package.json @@ -0,0 +1,9 @@ +{ + "name": "pluginomatic_fintest", + "description": "A test plugin", + "version": "0.0.1", + "author": "RedHog (Egil Moeller) ", + "contributors": [], + "dependencies": {}, + "engines": { "node": ">= 0.4.1 < 0.7.0" } +} diff --git a/available_plugins/pluginomatic_fintest/partlast.js b/available_plugins/pluginomatic_fintest/partlast.js new file mode 100644 index 00000000..c3f1fc3e --- /dev/null +++ b/available_plugins/pluginomatic_fintest/partlast.js @@ -0,0 +1,3 @@ +exports.somehook = function (hook_name, args, cb) { + return cb(["partlast:somehook was here"]); +} diff --git a/available_plugins/pluginomatic_fintest/pluginomatic.json b/available_plugins/pluginomatic_fintest/pluginomatic.json new file mode 100644 index 00000000..3b34c7ce --- /dev/null +++ b/available_plugins/pluginomatic_fintest/pluginomatic.json @@ -0,0 +1,32 @@ +{ + "parts": [ + { + "name": "somepart", + "pre": [], + "post": ["pluginomatic_onemoreplugin/partone"] + }, + { + "name": "partlast", + "pre": ["pluginomatic_fintest/otherpart"], + "post": [], + "hooks": { + "somehookname": "pluginomatic_fintest/partlast:somehook" + } + }, + { + "name": "partfirst", + "pre": [], + "post": ["pluginomatic_onemoreplugin/somepart"] + }, + { + "name": "otherpart", + "pre": ["pluginomatic_fintest/somepart", "pluginomatic_otherplugin/main"], + "post": [], + "hooks": { + "somehookname": "pluginomatic_fintest/otherpart:somehook", + "morehook": "pluginomatic_fintest/otherpart:morehook", + "expressServer": "pluginomatic_fintest/otherpart:expressServer" + } + } + ] +} From 441fd2f8eb4e2fedb4d902c31c3c88fbd096550b Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Fri, 24 Feb 2012 20:21:22 +0100 Subject: [PATCH 007/297] Bugfix for there being no registrations for a hook at all --- node/pluginfw/hooks.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/node/pluginfw/hooks.js b/node/pluginfw/hooks.js index d284b229..ae256217 100644 --- a/node/pluginfw/hooks.js +++ b/node/pluginfw/hooks.js @@ -18,12 +18,14 @@ 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 hook.hook(hook_name, args, function (x) { return x; }); })); } exports.aCallAll = function (hook_name, args, cb) { + if (plugins.hooks[hook_name] === undefined) cb([]); async.map( plugins.hooks[hook_name], function (hook, cb) { From ee40b23cfc051d929c10b99f8899bc8bc91560ea Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Fri, 24 Feb 2012 20:21:52 +0100 Subject: [PATCH 008/297] Added a fake plugin __builtin__ for builtin functionality --- node/pluginfw/plugins.js | 7 ++++++- pluginomatic.json | 6 ++++++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 pluginomatic.json diff --git a/node/pluginfw/plugins.js b/node/pluginfw/plugins.js index 2eb4d8e3..fcac21c0 100644 --- a/node/pluginfw/plugins.js +++ b/node/pluginfw/plugins.js @@ -32,6 +32,10 @@ exports.update = function (cb) { exports.getPlugins = function (cb) { exports.getPackages(function (er, packages) { + packages.__builtin__ = { + "path": path.resolve(npm.dir, "../..") + }; + var parts = {}; var plugins = {}; // Load plugin metadata pluginomatic.json @@ -83,8 +87,9 @@ exports.extractHooks = function (parts) { } exports.loadPlugin = function (packages, plugin_name, plugins, parts, cb) { + var plugin_path = path.resolve(packages[plugin_name].path, "pluginomatic.json"); fs.readFile( - path.resolve(packages[plugin_name].path, "pluginomatic.json"), + plugin_path, function (er, data) { var plugin = JSON.parse(data); plugin.package = packages[plugin_name]; diff --git a/pluginomatic.json b/pluginomatic.json new file mode 100644 index 00000000..1f8fe189 --- /dev/null +++ b/pluginomatic.json @@ -0,0 +1,6 @@ +{ + "parts": [{ + "name": "__builtin__", + "hooks": {} + }] +} From 1f2b52ba5af251d5002346b8fd493f2a1373d186 Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Fri, 24 Feb 2012 20:29:14 +0100 Subject: [PATCH 009/297] Builtin 'plugin' now works --- node/test.js | 5 +++++ pluginomatic.json | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 node/test.js diff --git a/node/test.js b/node/test.js new file mode 100644 index 00000000..5db54720 --- /dev/null +++ b/node/test.js @@ -0,0 +1,5 @@ +exports.expressServer = function (hook_name, args, cb) { + args.app.get('/testxx', function(req, res) { + res.send("Testing testing"); + }); +} diff --git a/pluginomatic.json b/pluginomatic.json index 1f8fe189..ca9ee416 100644 --- a/pluginomatic.json +++ b/pluginomatic.json @@ -1,6 +1,8 @@ { "parts": [{ "name": "__builtin__", - "hooks": {} + "hooks": { + "expressServer": "../test:expressServer" + } }] } From 21300bd6c7370525761b8067edae54c0c2ba5978 Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Fri, 24 Feb 2012 20:45:02 +0100 Subject: [PATCH 010/297] Moved static files serving to its own file --- node/server.js | 20 +++++++------------- node/static.js | 17 +++++++++++++++++ node/test.js | 5 ----- pluginomatic.json | 4 ++-- 4 files changed, 26 insertions(+), 20 deletions(-) create mode 100644 node/static.js delete mode 100644 node/test.js diff --git a/node/server.js b/node/server.js index 804a1ad8..de50ea24 100644 --- a/node/server.js +++ b/node/server.js @@ -72,6 +72,13 @@ log4js.setGlobalLogLevel(settings.loglevel); async.waterfall([ plugins.update, + function (callback) { + console.log(["plugins", plugins.plugins]); + console.log(["parts", plugins.parts]); + console.log(["hooks", plugins.hooks]); + callback(); + }, + //initalize the database function (callback) { @@ -147,19 +154,6 @@ async.waterfall([ gracefulShutdown(); }); - //serve static files - app.get('/static/js/require-kernel.js', function (req, res, next) { - res.header("Content-Type","application/javascript; charset: utf-8"); - res.write(minify.requireDefinition()); - res.end(); - }); - app.get('/static/*', function(req, res) - { - var filePath = path.normalize(__dirname + "/.." + - req.url.replace(/\.\./g, '').split("?")[0]); - res.sendfile(filePath, { maxAge: exports.maxAge }); - }); - //serve minified files app.get('/minified/:filename', minify.minifyJS); diff --git a/node/static.js b/node/static.js new file mode 100644 index 00000000..71f40b45 --- /dev/null +++ b/node/static.js @@ -0,0 +1,17 @@ +var path = require('path'); +var minify = require('./utils/Minify'); + +exports.expressServer = function (hook_name, args, cb) { + //serve static files + args.app.get('/static/js/require-kernel.js', function (req, res, next) { + res.header("Content-Type","application/javascript; charset: utf-8"); + res.write(minify.requireDefinition()); + res.end(); + }); + args.app.get('/static/*', function(req, res) + { + var filePath = path.normalize(__dirname + "/.." + + req.url.replace(/\.\./g, '').split("?")[0]); + res.sendfile(filePath, { maxAge: exports.maxAge }); + }); +} diff --git a/node/test.js b/node/test.js deleted file mode 100644 index 5db54720..00000000 --- a/node/test.js +++ /dev/null @@ -1,5 +0,0 @@ -exports.expressServer = function (hook_name, args, cb) { - args.app.get('/testxx', function(req, res) { - res.send("Testing testing"); - }); -} diff --git a/pluginomatic.json b/pluginomatic.json index ca9ee416..e78f1149 100644 --- a/pluginomatic.json +++ b/pluginomatic.json @@ -1,8 +1,8 @@ { "parts": [{ - "name": "__builtin__", + "name": "static", "hooks": { - "expressServer": "../test:expressServer" + "expressServer": "../static:expressServer" } }] } From 752dc5ca265f39a1bb8124cd4ce2b6843c8e1836 Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Fri, 24 Feb 2012 20:50:55 +0100 Subject: [PATCH 011/297] Moved special pages ( /, /robots.txt, /favicon.ico ) to their own module --- node/server.js | 31 +------------------------------ node/specialpages.js | 33 +++++++++++++++++++++++++++++++++ pluginomatic.json | 18 +++++++++++++----- 3 files changed, 47 insertions(+), 35 deletions(-) create mode 100644 node/specialpages.js diff --git a/node/server.js b/node/server.js index de50ea24..2f0b47ff 100644 --- a/node/server.js +++ b/node/server.js @@ -372,36 +372,7 @@ async.waterfall([ res.end("OK"); }); }); - - //serve index.html under / - app.get('/', function(req, res) - { - var filePath = path.normalize(__dirname + "/../static/index.html"); - res.sendfile(filePath, { maxAge: exports.maxAge }); - }); - - //serve robots.txt - app.get('/robots.txt', function(req, res) - { - var filePath = path.normalize(__dirname + "/../static/robots.txt"); - res.sendfile(filePath, { maxAge: exports.maxAge }); - }); - - //serve favicon.ico - app.get('/favicon.ico', function(req, res) - { - var filePath = path.normalize(__dirname + "/../static/custom/favicon.ico"); - res.sendfile(filePath, { maxAge: exports.maxAge }, function(err) - { - //there is no custom favicon, send the default favicon - if(err) - { - filePath = path.normalize(__dirname + "/../static/favicon.ico"); - res.sendfile(filePath, { maxAge: exports.maxAge }); - } - }); - }); - + //let the server listen app.listen(settings.port, settings.ip); console.log("Server is listening at " + settings.ip + ":" + settings.port); diff --git a/node/specialpages.js b/node/specialpages.js new file mode 100644 index 00000000..a920d6f1 --- /dev/null +++ b/node/specialpages.js @@ -0,0 +1,33 @@ +var path = require('path'); + +exports.expressServer = function (hook_name, args, cb) { + + //serve index.html under / + args.app.get('/', function(req, res) + { + var filePath = path.normalize(__dirname + "/../static/index.html"); + res.sendfile(filePath, { maxAge: exports.maxAge }); + }); + + //serve robots.txt + args.app.get('/robots.txt', function(req, res) + { + var filePath = path.normalize(__dirname + "/../static/robots.txt"); + res.sendfile(filePath, { maxAge: exports.maxAge }); + }); + + //serve favicon.ico + args.app.get('/favicon.ico', function(req, res) + { + var filePath = path.normalize(__dirname + "/../static/custom/favicon.ico"); + res.sendfile(filePath, { maxAge: exports.maxAge }, function(err) + { + //there is no custom favicon, send the default favicon + if(err) + { + filePath = path.normalize(__dirname + "/../static/favicon.ico"); + res.sendfile(filePath, { maxAge: exports.maxAge }); + } + }); + }); +} \ No newline at end of file diff --git a/pluginomatic.json b/pluginomatic.json index e78f1149..fe5039e3 100644 --- a/pluginomatic.json +++ b/pluginomatic.json @@ -1,8 +1,16 @@ { - "parts": [{ - "name": "static", - "hooks": { - "expressServer": "../static:expressServer" + "parts": [ + { + "name": "static", + "hooks": { + "expressServer": "../static:expressServer" + } + }, + { + "name": "specialpages", + "hooks": { + "expressServer": "../specialpages:expressServer" + } } - }] + ] } From e3770e42b679750c25f208b28f6588c4c210afb8 Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Fri, 24 Feb 2012 20:53:42 +0100 Subject: [PATCH 012/297] Moved /p/:pad and /p/:pad/timeslider static html to specialpages --- node/server.js | 14 -------------- node/specialpages.js | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/node/server.js b/node/server.js index 2f0b47ff..f07bdd5d 100644 --- a/node/server.js +++ b/node/server.js @@ -254,20 +254,6 @@ async.waterfall([ }); }); - //serve pad.html under /p - app.get('/p/:pad', function(req, res, next) - { - var filePath = path.normalize(__dirname + "/../static/pad.html"); - res.sendfile(filePath, { maxAge: exports.maxAge }); - }); - - //serve timeslider.html under /p/$padname/timeslider - app.get('/p/:pad/timeslider', function(req, res, next) - { - var filePath = path.normalize(__dirname + "/../static/timeslider.html"); - res.sendfile(filePath, { maxAge: exports.maxAge }); - }); - //serve timeslider.html under /p/$padname/timeslider app.get('/p/:pad/:rev?/export/:type', function(req, res, next) { diff --git a/node/specialpages.js b/node/specialpages.js index a920d6f1..9a4bcb33 100644 --- a/node/specialpages.js +++ b/node/specialpages.js @@ -30,4 +30,19 @@ exports.expressServer = function (hook_name, args, cb) { } }); }); + + //serve pad.html under /p + args.app.get('/p/:pad', function(req, res, next) + { + var filePath = path.normalize(__dirname + "/../static/pad.html"); + res.sendfile(filePath, { maxAge: exports.maxAge }); + }); + + //serve timeslider.html under /p/$padname/timeslider + args.app.get('/p/:pad/timeslider', function(req, res, next) + { + var filePath = path.normalize(__dirname + "/../static/timeslider.html"); + res.sendfile(filePath, { maxAge: exports.maxAge }); + }); + } \ No newline at end of file From 0730eb5b8d46bcd2c2beb9e82a2e6de6c4e68e78 Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Fri, 24 Feb 2012 23:38:37 +0100 Subject: [PATCH 013/297] Bugfix for not loading plugins until after db, plus moved padursanitize into own module --- node/padurlsanitize.js | 29 +++++++++++++++++++++++++++++ node/server.js | 38 ++++++-------------------------------- pluginomatic.json | 6 ++++++ 3 files changed, 41 insertions(+), 32 deletions(-) create mode 100644 node/padurlsanitize.js diff --git a/node/padurlsanitize.js b/node/padurlsanitize.js new file mode 100644 index 00000000..b3885578 --- /dev/null +++ b/node/padurlsanitize.js @@ -0,0 +1,29 @@ +var padManager = require('./db/PadManager'); + +exports.expressServer = function (hook_name, args, cb) { + //redirects browser to the pad's sanitized url if needed. otherwise, renders the html + args.app.param('pad', function (req, res, next, padId) { + //ensure the padname is valid and the url doesn't end with a / + if(!padManager.isValidPadId(padId) || /\/$/.test(req.url)) + { + res.send('Such a padname is forbidden', 404); + } + else + { + padManager.sanitizePadId(padId, function(sanitizedPadId) { + //the pad id was sanitized, so we redirect to the sanitized version + if(sanitizedPadId != padId) + { + var real_path = req.path.replace(/^\/p\/[^\/]+/, '/p/' + sanitizedPadId); + res.header('Location', real_path); + res.send('You should be redirected to ' + real_path + '', 302); + } + //the pad id was fine, so just render it + else + { + next(); + } + }); + } + }); +} diff --git a/node/server.js b/node/server.js index f07bdd5d..4d4ca31e 100644 --- a/node/server.js +++ b/node/server.js @@ -70,6 +70,12 @@ exports.maxAge = 1000*60*60*6; log4js.setGlobalLogLevel(settings.loglevel); async.waterfall([ + //initalize the database + function (callback) + { + db.init(callback); + }, + plugins.update, function (callback) { @@ -79,11 +85,6 @@ async.waterfall([ callback(); }, - //initalize the database - function (callback) - { - db.init(callback); - }, //initalize the http server function (callback) { @@ -97,33 +98,6 @@ async.waterfall([ next(); }); - - //redirects browser to the pad's sanitized url if needed. otherwise, renders the html - app.param('pad', function (req, res, next, padId) { - //ensure the padname is valid and the url doesn't end with a / - if(!padManager.isValidPadId(padId) || /\/$/.test(req.url)) - { - res.send('Such a padname is forbidden', 404); - } - else - { - padManager.sanitizePadId(padId, function(sanitizedPadId) { - //the pad id was sanitized, so we redirect to the sanitized version - if(sanitizedPadId != padId) - { - var real_path = req.path.replace(/^\/p\/[^\/]+/, '/p/' + sanitizedPadId); - res.header('Location', real_path); - res.send('You should be redirected to ' + real_path + '', 302); - } - //the pad id was fine, so just render it - else - { - next(); - } - }); - } - }); - //load modules that needs a initalized db readOnlyManager = require("./db/ReadOnlyManager"); exporthtml = require("./utils/ExportHtml"); diff --git a/pluginomatic.json b/pluginomatic.json index fe5039e3..dc584bc8 100644 --- a/pluginomatic.json +++ b/pluginomatic.json @@ -11,6 +11,12 @@ "hooks": { "expressServer": "../specialpages:expressServer" } + }, + { + "name": "padurlsanitize", + "hooks": { + "expressServer": "../padurlsanitize:expressServer" + } } ] } From 28babf0aa571a60a5cd2e541602c0b3013cc5b53 Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Fri, 24 Feb 2012 23:55:19 +0100 Subject: [PATCH 014/297] Moved minified --- node/minified.js | 6 ++++++ node/server.js | 3 --- pluginomatic.json | 6 ++++++ 3 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 node/minified.js diff --git a/node/minified.js b/node/minified.js new file mode 100644 index 00000000..57978a1e --- /dev/null +++ b/node/minified.js @@ -0,0 +1,6 @@ +var minify = require('./utils/Minify'); + +exports.expressServer = function (hook_name, args, cb) { + //serve minified files + args.app.get('/minified/:filename', minify.minifyJS); +} diff --git a/node/server.js b/node/server.js index 4d4ca31e..cdd1c422 100644 --- a/node/server.js +++ b/node/server.js @@ -128,9 +128,6 @@ async.waterfall([ gracefulShutdown(); }); - //serve minified files - app.get('/minified/:filename', minify.minifyJS); - //checks for padAccess function hasPadAccess(req, res, callback) { diff --git a/pluginomatic.json b/pluginomatic.json index dc584bc8..d2083652 100644 --- a/pluginomatic.json +++ b/pluginomatic.json @@ -17,6 +17,12 @@ "hooks": { "expressServer": "../padurlsanitize:expressServer" } + }, + { + "name": "minified", + "hooks": { + "expressServer": "../minified:expressServer" + } } ] } From fed805be82275ec726e4d60beb98faf1c1396dea Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Fri, 24 Feb 2012 23:56:54 +0100 Subject: [PATCH 015/297] Reindentation of pluginomatic.json --- pluginomatic.json | 28 ++++------------------------ 1 file changed, 4 insertions(+), 24 deletions(-) diff --git a/pluginomatic.json b/pluginomatic.json index d2083652..f7522643 100644 --- a/pluginomatic.json +++ b/pluginomatic.json @@ -1,28 +1,8 @@ { "parts": [ - { - "name": "static", - "hooks": { - "expressServer": "../static:expressServer" - } - }, - { - "name": "specialpages", - "hooks": { - "expressServer": "../specialpages:expressServer" - } - }, - { - "name": "padurlsanitize", - "hooks": { - "expressServer": "../padurlsanitize:expressServer" - } - }, - { - "name": "minified", - "hooks": { - "expressServer": "../minified:expressServer" - } - } + { "name": "static", "hooks": { "expressServer": "../static:expressServer" } }, + { "name": "specialpages", "hooks": { "expressServer": "../specialpages:expressServer" } }, + { "name": "padurlsanitize", "hooks": { "expressServer": "../padurlsanitize:expressServer" } }, + { "name": "minified", "hooks": { "expressServer": "../minified:expressServer" } } ] } From a89c81f62f93c3ec5c76f20bac8aaa70f1235a64 Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Sat, 25 Feb 2012 00:15:57 +0100 Subject: [PATCH 016/297] Moved padreadonly --- node/padaccess.js | 21 ++++++++++++ node/padreadonly.js | 65 +++++++++++++++++++++++++++++++++++++ node/server.js | 78 +-------------------------------------------- pluginomatic.json | 3 +- 4 files changed, 89 insertions(+), 78 deletions(-) create mode 100644 node/padaccess.js create mode 100644 node/padreadonly.js diff --git a/node/padaccess.js b/node/padaccess.js new file mode 100644 index 00000000..a3d1df33 --- /dev/null +++ b/node/padaccess.js @@ -0,0 +1,21 @@ +var ERR = require("async-stacktrace"); +var securityManager = require('./db/SecurityManager'); + +//checks for padAccess +module.exports = function (req, res, callback) { + + // FIXME: Why is this ever undefined?? + if (req.cookies === undefined) req.cookies = {}; + + securityManager.checkAccess(req.params.pad, req.cookies.sessionid, req.cookies.token, req.cookies.password, function(err, accessObj) { + if(ERR(err, callback)) return; + + //there is access, continue + if(accessObj.accessStatus == "grant") { + callback(); + //no access + } else { + res.send("403 - Can't touch this", 403); + } + }); +} diff --git a/node/padreadonly.js b/node/padreadonly.js new file mode 100644 index 00000000..50a5e06e --- /dev/null +++ b/node/padreadonly.js @@ -0,0 +1,65 @@ +var async = require('async'); +var readOnlyManager = require("./db/ReadOnlyManager"); +var hasPadAccess = require("./padaccess"); +var exporthtml = require("./utils/ExportHtml"); +var ERR = require("async-stacktrace"); + +exports.expressServer = function (hook_name, args, cb) { + //serve read only pad + args.app.get('/ro/:id', function(req, res) + { + var html; + var padId; + var pad; + + async.series([ + //translate the read only pad to a padId + function(callback) + { + readOnlyManager.getPadId(req.params.id, function(err, _padId) + { + if(ERR(err, callback)) return; + + padId = _padId; + + //we need that to tell hasPadAcess about the pad + req.params.pad = padId; + + callback(); + }); + }, + //render the html document + function(callback) + { + //return if the there is no padId + if(padId == null) + { + callback("notfound"); + return; + } + + hasPadAccess(req, res, function() + { + //render the html document + exporthtml.getPadHTMLDocument(padId, null, false, function(err, _html) + { + if(ERR(err, callback)) return; + html = _html; + callback(); + }); + }); + } + ], function(err) + { + //throw any unexpected error + if(err && err != "notfound") + ERR(err); + + if(err == "notfound") + res.send('404 - Not Found', 404); + else + res.send(html); + }); + }); + +} \ No newline at end of file diff --git a/node/server.js b/node/server.js index cdd1c422..8795273f 100644 --- a/node/server.js +++ b/node/server.js @@ -107,6 +107,7 @@ async.waterfall([ padManager = require('./db/PadManager'); securityManager = require('./db/SecurityManager'); socketIORouter = require("./handler/SocketIORouter"); + hasPadAccess = require("./padaccess"); //install logging var httpLogger = log4js.getLogger("http"); @@ -128,26 +129,6 @@ async.waterfall([ gracefulShutdown(); }); - //checks for padAccess - function hasPadAccess(req, res, callback) - { - securityManager.checkAccess(req.params.pad, req.cookies.sessionid, req.cookies.token, req.cookies.password, function(err, accessObj) - { - if(ERR(err, callback)) return; - - //there is access, continue - if(accessObj.accessStatus == "grant") - { - callback(); - } - //no access - else - { - res.send("403 - Can't touch this", 403); - } - }); - } - //checks for basic http auth function basic_auth (req, res, next) { if (req.headers.authorization && req.headers.authorization.search('Basic ') === 0) { @@ -168,63 +149,6 @@ async.waterfall([ } } - //serve read only pad - app.get('/ro/:id', function(req, res) - { - var html; - var padId; - var pad; - - async.series([ - //translate the read only pad to a padId - function(callback) - { - readOnlyManager.getPadId(req.params.id, function(err, _padId) - { - if(ERR(err, callback)) return; - - padId = _padId; - - //we need that to tell hasPadAcess about the pad - req.params.pad = padId; - - callback(); - }); - }, - //render the html document - function(callback) - { - //return if the there is no padId - if(padId == null) - { - callback("notfound"); - return; - } - - hasPadAccess(req, res, function() - { - //render the html document - exporthtml.getPadHTMLDocument(padId, null, false, function(err, _html) - { - if(ERR(err, callback)) return; - html = _html; - callback(); - }); - }); - } - ], function(err) - { - //throw any unexpected error - if(err && err != "notfound") - ERR(err); - - if(err == "notfound") - res.send('404 - Not Found', 404); - else - res.send(html); - }); - }); - //serve timeslider.html under /p/$padname/timeslider app.get('/p/:pad/:rev?/export/:type', function(req, res, next) { diff --git a/pluginomatic.json b/pluginomatic.json index f7522643..c1d6ae06 100644 --- a/pluginomatic.json +++ b/pluginomatic.json @@ -3,6 +3,7 @@ { "name": "static", "hooks": { "expressServer": "../static:expressServer" } }, { "name": "specialpages", "hooks": { "expressServer": "../specialpages:expressServer" } }, { "name": "padurlsanitize", "hooks": { "expressServer": "../padurlsanitize:expressServer" } }, - { "name": "minified", "hooks": { "expressServer": "../minified:expressServer" } } + { "name": "minified", "hooks": { "expressServer": "../minified:expressServer" } }, + { "name": "padreadonly", "hooks": { "expressServer": "../padreadonly:expressServer" } } ] } From 26d9c3ed53ed84e92fa001ea68bfad36b358d05f Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Sat, 25 Feb 2012 13:37:47 +0100 Subject: [PATCH 017/297] Better plugin error handling --- node/pluginfw/hooks.js | 18 ++++++++++++++---- node/pluginfw/plugins.js | 7 ++++++- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/node/pluginfw/hooks.js b/node/pluginfw/hooks.js index ae256217..ed6cef28 100644 --- a/node/pluginfw/hooks.js +++ b/node/pluginfw/hooks.js @@ -2,6 +2,16 @@ var plugins = require("./plugins"); var async = require("async"); +var hookCallWrapper = function (hook, hook_name, args, cb) { + if (cb === undefined) cb = function (x) { return x; }; + try { + return hook.hook(hook_name, args, cb); + } catch (ex) { + console.error([hook_name, hook.part.full_name, ex]); + } +} + + /* Don't use Array.concat as it flatterns arrays within the array */ exports.flatten = function (lst) { var res = []; @@ -20,7 +30,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 hook.hook(hook_name, args, function (x) { return x; }); + return hookCallWrapper(hook, hook_name, args); })); } @@ -29,7 +39,7 @@ exports.aCallAll = function (hook_name, args, cb) { async.map( plugins.hooks[hook_name], function (hook, cb) { - hook.hook(hook_name, args, function (res) { cb(null, res); }); + hookCallWrapper(hook, hook_name, args, function (res) { cb(null, res); }); }, function (err, res) { cb(exports.flatten(res)); @@ -39,10 +49,10 @@ exports.aCallAll = function (hook_name, args, cb) { exports.callFirst = function (hook_name, args) { if (plugins.hooks[hook_name][0] === undefined) return []; - return exports.flatten(plugins.hooks[hook_name][0].hook(hook_name, args, function (x) { return x; })); + return exports.flatten(hookCallWrapper(plugins.hooks[hook_name][0], hook_name, args)); } exports.aCallFirst = function (hook_name, args, cb) { if (plugins.hooks[hook_name][0] === undefined) cb([]); - plugins.hooks[hook_name][0].hook(hook_name, args, function (res) { cb(exports.flatten(res)); }); + hookCallWrapper(plugins.hooks[hook_name][0], hook_name, args, function (res) { cb(exports.flatten(res)); }); } diff --git a/node/pluginfw/plugins.js b/node/pluginfw/plugins.js index fcac21c0..8608e6a0 100644 --- a/node/pluginfw/plugins.js +++ b/node/pluginfw/plugins.js @@ -80,7 +80,12 @@ exports.extractHooks = function (parts) { Object.keys(part.hooks || {}).forEach(function (hook_name) { if (hooks[hook_name] === undefined) hooks[hook_name] = []; var hook_fn_name = part.hooks[hook_name]; - hooks[hook_name].push({"hook": exports.loadFn(part.hooks[hook_name]), "part": part}); + var hook_fn = exports.loadFn(part.hooks[hook_name]); + if (hook_fn) { + hooks[hook_name].push({"hook": hook_fn, "part": part}); + } else { + console.error("Unable to load hook function for " + part.full_name + " for hook " + hook_name + ": " + part.hooks[hook_name]); + } }); }); return hooks; From fe7bed650164dde9a3ed736b8d1117f1054e0919 Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Sat, 25 Feb 2012 13:38:09 +0100 Subject: [PATCH 018/297] Moved webaccess --- node/server.js | 35 ++--------------------------------- node/webaccess.js | 36 ++++++++++++++++++++++++++++++++++++ pluginomatic.json | 12 +++++++----- 3 files changed, 45 insertions(+), 38 deletions(-) create mode 100644 node/webaccess.js diff --git a/node/server.js b/node/server.js index 8795273f..080d4c1a 100644 --- a/node/server.js +++ b/node/server.js @@ -90,8 +90,7 @@ async.waterfall([ { //create server var app = express.createServer(); - - hooks.callAll("expressServer", {"app": app}); + hooks.callAll("expressCreateServer", {"app": app}); app.use(function (req, res, next) { res.header("Server", serverName); @@ -111,17 +110,7 @@ async.waterfall([ //install logging var httpLogger = log4js.getLogger("http"); - app.configure(function() - { - // Activate http basic auth if it has been defined in settings.json - if(settings.httpAuth != null) app.use(basic_auth); - - // If the log level specified in the config file is WARN or ERROR the application server never starts listening to requests as reported in issue #158. - // Not installing the log4js connect logger when the log level has a higher severity than INFO since it would not log at that level anyway. - if (!(settings.loglevel === "WARN" || settings.loglevel == "ERROR")) - app.use(log4js.connectLogger(httpLogger, { level: log4js.levels.INFO, format: ':status, :method :url'})); - app.use(express.cookieParser()); - }); + app.configure(function() { hooks.callAll("expressConfigure", {"app": app}); }); app.error(function(err, req, res, next){ res.send(500); @@ -129,26 +118,6 @@ async.waterfall([ gracefulShutdown(); }); - //checks for basic http auth - function basic_auth (req, res, next) { - if (req.headers.authorization && req.headers.authorization.search('Basic ') === 0) { - // fetch login and password - if (new Buffer(req.headers.authorization.split(' ')[1], 'base64').toString() == settings.httpAuth) { - next(); - return; - } - } - - res.header('WWW-Authenticate', 'Basic realm="Protected Area"'); - if (req.headers.authorization) { - setTimeout(function () { - res.send('Authentication required', 401); - }, 1000); - } else { - res.send('Authentication required', 401); - } - } - //serve timeslider.html under /p/$padname/timeslider app.get('/p/:pad/:rev?/export/:type', function(req, res, next) { diff --git a/node/webaccess.js b/node/webaccess.js new file mode 100644 index 00000000..05c398a0 --- /dev/null +++ b/node/webaccess.js @@ -0,0 +1,36 @@ +var settings = require('./utils/Settings'); +var express = require('express'); +var log4js = require('log4js'); +var httpLogger = log4js.getLogger("http"); + + +//checks for basic http auth +exports.basicAuth = function (req, res, next) { + if (req.headers.authorization && req.headers.authorization.search('Basic ') === 0) { + // fetch login and password + if (new Buffer(req.headers.authorization.split(' ')[1], 'base64').toString() == settings.httpAuth) { + next(); + return; + } + } + + res.header('WWW-Authenticate', 'Basic realm="Protected Area"'); + if (req.headers.authorization) { + setTimeout(function () { + res.send('Authentication required', 401); + }, 1000); + } else { + res.send('Authentication required', 401); + } +} + +exports.expressConfigure = function (hook_name, args, cb) { + // Activate http basic auth if it has been defined in settings.json + if(settings.httpAuth != null) args.app.use(exports.basicAuth); + + // If the log level specified in the config file is WARN or ERROR the application server never starts listening to requests as reported in issue #158. + // Not installing the log4js connect logger when the log level has a higher severity than INFO since it would not log at that level anyway. + if (!(settings.loglevel === "WARN" || settings.loglevel == "ERROR")) + args.app.use(log4js.connectLogger(httpLogger, { level: log4js.levels.INFO, format: ':status, :method :url'})); + args.app.use(express.cookieParser()); +} diff --git a/pluginomatic.json b/pluginomatic.json index c1d6ae06..237f5c64 100644 --- a/pluginomatic.json +++ b/pluginomatic.json @@ -1,9 +1,11 @@ { "parts": [ - { "name": "static", "hooks": { "expressServer": "../static:expressServer" } }, - { "name": "specialpages", "hooks": { "expressServer": "../specialpages:expressServer" } }, - { "name": "padurlsanitize", "hooks": { "expressServer": "../padurlsanitize:expressServer" } }, - { "name": "minified", "hooks": { "expressServer": "../minified:expressServer" } }, - { "name": "padreadonly", "hooks": { "expressServer": "../padreadonly:expressServer" } } + { "name": "static", "hooks": { "expressCreateServer": "../static:expressServer" } }, + { "name": "specialpages", "hooks": { "expressCreateServer": "../specialpages:expressServer" } }, + { "name": "padurlsanitize", "hooks": { "expressCreateServer": "../padurlsanitize:expressServer" } }, + { "name": "minified", "hooks": { "expressCreateServer": "../minified:expressServer" } }, + { "name": "padreadonly", "hooks": { "expressCreateServer": "../padreadonly:expressServer" } }, + { "name": "webaccess", "hooks": { "expressConfigure": "../webaccess:expressConfigure" } } + ] } From a5245c896aa6f89a855f7b3603fbb1e48fb06f64 Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Sat, 25 Feb 2012 15:20:31 +0100 Subject: [PATCH 019/297] Moved apicalls --- node/apicalls.js | 58 ++++++++++++++++++++++++++++++++++++++++++++ node/server.js | 61 ----------------------------------------------- pluginomatic.json | 3 ++- 3 files changed, 60 insertions(+), 62 deletions(-) create mode 100644 node/apicalls.js diff --git a/node/apicalls.js b/node/apicalls.js new file mode 100644 index 00000000..183f4411 --- /dev/null +++ b/node/apicalls.js @@ -0,0 +1,58 @@ +var log4js = require('log4js'); +var apiLogger = log4js.getLogger("API"); +var apiHandler = require('./handler/APIHandler'); +var formidable = require('formidable'); + +//This is for making an api call, collecting all post information and passing it to the apiHandler +exports.apiCaller = function(req, res, fields) { + res.header("Content-Type", "application/json; charset=utf-8"); + + apiLogger.info("REQUEST, " + req.params.func + ", " + JSON.stringify(fields)); + + //wrap the send function so we can log the response + res._send = res.send; + res.send = function (response) { + response = JSON.stringify(response); + apiLogger.info("RESPONSE, " + req.params.func + ", " + response); + + //is this a jsonp call, if yes, add the function call + if(req.query.jsonp) + response = req.query.jsonp + "(" + response + ")"; + + res._send(response); + } + + //call the api handler + apiHandler.handle(req.params.func, fields, req, res); +} + + +exports.expressCreateServer = function (hook_name, args, cb) { + //This is a api GET call, collect all post informations and pass it to the apiHandler + args.app.get('/api/1/:func', function (req, res) { + apiCaller(req, res, req.query) + }); + + //This is a api POST call, collect all post informations and pass it to the apiHandler + args.app.post('/api/1/:func', function(req, res) { + new formidable.IncomingForm().parse(req, function (err, fields, files) { + apiCaller(req, res, fields) + }); + }); + + //The Etherpad client side sends information about how a disconnect happen + args.app.post('/ep/pad/connection-diagnostic-info', function(req, res) { + new formidable.IncomingForm().parse(req, function(err, fields, files) { + console.log("DIAGNOSTIC-INFO: " + fields.diagnosticInfo); + res.end("OK"); + }); + }); + + //The Etherpad client side sends information about client side javscript errors + args.app.post('/jserror', function(req, res) { + new formidable.IncomingForm().parse(req, function(err, fields, files) { + console.error("CLIENT SIDE JAVASCRIPT ERROR: " + fields.errorInfo); + res.end("OK"); + }); + }); +} \ No newline at end of file diff --git a/node/server.js b/node/server.js index 080d4c1a..fec7668c 100644 --- a/node/server.js +++ b/node/server.js @@ -161,67 +161,6 @@ async.waterfall([ }); }); - var apiLogger = log4js.getLogger("API"); - - //This is for making an api call, collecting all post information and passing it to the apiHandler - var apiCaller = function(req, res, fields) - { - res.header("Content-Type", "application/json; charset=utf-8"); - - apiLogger.info("REQUEST, " + req.params.func + ", " + JSON.stringify(fields)); - - //wrap the send function so we can log the response - res._send = res.send; - res.send = function(response) - { - response = JSON.stringify(response); - apiLogger.info("RESPONSE, " + req.params.func + ", " + response); - - //is this a jsonp call, if yes, add the function call - if(req.query.jsonp) - response = req.query.jsonp + "(" + response + ")"; - - res._send(response); - } - - //call the api handler - apiHandler.handle(req.params.func, fields, req, res); - } - - //This is a api GET call, collect all post informations and pass it to the apiHandler - app.get('/api/1/:func', function(req, res) - { - apiCaller(req, res, req.query) - }); - - //This is a api POST call, collect all post informations and pass it to the apiHandler - app.post('/api/1/:func', function(req, res) - { - new formidable.IncomingForm().parse(req, function(err, fields, files) - { - apiCaller(req, res, fields) - }); - }); - - //The Etherpad client side sends information about how a disconnect happen - app.post('/ep/pad/connection-diagnostic-info', function(req, res) - { - new formidable.IncomingForm().parse(req, function(err, fields, files) - { - console.log("DIAGNOSTIC-INFO: " + fields.diagnosticInfo); - res.end("OK"); - }); - }); - - //The Etherpad client side sends information about client side javscript errors - app.post('/jserror', function(req, res) - { - new formidable.IncomingForm().parse(req, function(err, fields, files) - { - console.error("CLIENT SIDE JAVASCRIPT ERROR: " + fields.errorInfo); - res.end("OK"); - }); - }); //let the server listen app.listen(settings.port, settings.ip); diff --git a/pluginomatic.json b/pluginomatic.json index 237f5c64..498384e2 100644 --- a/pluginomatic.json +++ b/pluginomatic.json @@ -5,7 +5,8 @@ { "name": "padurlsanitize", "hooks": { "expressCreateServer": "../padurlsanitize:expressServer" } }, { "name": "minified", "hooks": { "expressCreateServer": "../minified:expressServer" } }, { "name": "padreadonly", "hooks": { "expressCreateServer": "../padreadonly:expressServer" } }, - { "name": "webaccess", "hooks": { "expressConfigure": "../webaccess:expressConfigure" } } + { "name": "webaccess", "hooks": { "expressConfigure": "../webaccess:expressConfigure" } }, + { "name": "apicalls", "hooks": { "expressCreateServer": "../apicalls:expressCreateServer" } } ] } From 1c0734e97b6bc8f7125dbb29d374edba8047d247 Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Sat, 25 Feb 2012 15:44:04 +0100 Subject: [PATCH 020/297] Better hook debug printout --- node/pluginfw/hooks.js | 2 +- node/pluginfw/plugins.js | 20 +++++++++++++++++++- node/server.js | 6 +++--- 3 files changed, 23 insertions(+), 5 deletions(-) diff --git a/node/pluginfw/hooks.js b/node/pluginfw/hooks.js index ed6cef28..2484c3d5 100644 --- a/node/pluginfw/hooks.js +++ b/node/pluginfw/hooks.js @@ -5,7 +5,7 @@ var async = require("async"); var hookCallWrapper = function (hook, hook_name, args, cb) { if (cb === undefined) cb = function (x) { return x; }; try { - return hook.hook(hook_name, args, cb); + return hook.hook_fn(hook_name, args, cb); } catch (ex) { console.error([hook_name, hook.part.full_name, ex]); } diff --git a/node/pluginfw/plugins.js b/node/pluginfw/plugins.js index 8608e6a0..2c0c00ff 100644 --- a/node/pluginfw/plugins.js +++ b/node/pluginfw/plugins.js @@ -30,6 +30,24 @@ exports.update = function (cb) { }); } +exports.formatPlugins = function () { + return Object.keys(exports.plugins).join(", "); +} + +exports.formatParts = function () { + return exports.parts.map(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) { + res.push(hook.hook_name + ": " + hook.hook_fn_name + " from " + hook.part.full_name); + }); + }); + return res.join("\n"); +} + exports.getPlugins = function (cb) { exports.getPackages(function (er, packages) { packages.__builtin__ = { @@ -82,7 +100,7 @@ exports.extractHooks = function (parts) { var hook_fn_name = part.hooks[hook_name]; var hook_fn = exports.loadFn(part.hooks[hook_name]); if (hook_fn) { - hooks[hook_name].push({"hook": hook_fn, "part": part}); + hooks[hook_name].push({"hook_name": hook_name, "hook_fn": hook_fn, "hook_fn_name": hook_fn_name, "part": part}); } else { console.error("Unable to load hook function for " + part.full_name + " for hook " + hook_name + ": " + part.hooks[hook_name]); } diff --git a/node/server.js b/node/server.js index fec7668c..b3a36c2c 100644 --- a/node/server.js +++ b/node/server.js @@ -79,9 +79,9 @@ async.waterfall([ plugins.update, function (callback) { - console.log(["plugins", plugins.plugins]); - console.log(["parts", plugins.parts]); - console.log(["hooks", plugins.hooks]); + console.log("Installed plugins: " + plugins.formatPlugins()); + console.log("Installed parts:\n" + plugins.formatParts()); + console.log("Installed hooks:\n" + plugins.formatHooks()); callback(); }, From 24dda0c54db1fb347c4369ccd1802598db2f9448 Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Sat, 25 Feb 2012 16:06:08 +0100 Subject: [PATCH 021/297] Moved importexport --- node/importexport.js | 41 +++++++++++++++++++++++++++++++++++++++++ node/server.js | 43 ------------------------------------------- pluginomatic.json | 3 ++- 3 files changed, 43 insertions(+), 44 deletions(-) create mode 100644 node/importexport.js diff --git a/node/importexport.js b/node/importexport.js new file mode 100644 index 00000000..b53447da --- /dev/null +++ b/node/importexport.js @@ -0,0 +1,41 @@ +var hasPadAccess = require("./padaccess"); +var settings = require('./utils/Settings'); +var exportHandler = require('./handler/ExportHandler'); +var importHandler = require('./handler/ImportHandler'); + +exports.expressCreateServer = function (hook_name, args, cb) { + args.app.get('/p/:pad/:rev?/export/:type', function(req, res, next) { + var types = ["pdf", "doc", "txt", "html", "odt", "dokuwiki"]; + //send a 404 if we don't support this filetype + if (types.indexOf(req.params.type) == -1) { + next(); + return; + } + + //if abiword is disabled, and this is a format we only support with abiword, output a message + if (settings.abiword == null && + ["odt", "pdf", "doc"].indexOf(req.params.type) !== -1) { + res.send("Abiword is not enabled at this Etherpad Lite instance. Set the path to Abiword in settings.json to enable this feature"); + return; + } + + res.header("Access-Control-Allow-Origin", "*"); + + hasPadAccess(req, res, function() { + exportHandler.doExport(req, res, req.params.pad, req.params.type); + }); + }); + + //handle import requests + args.app.post('/p/:pad/import', function(req, res, next) { + //if abiword is disabled, skip handling this request + if(settings.abiword == null) { + next(); + return; + } + + hasPadAccess(req, res, function() { + importHandler.doImport(req, res, req.params.pad); + }); + }); +} diff --git a/node/server.js b/node/server.js index b3a36c2c..f97afd0f 100644 --- a/node/server.js +++ b/node/server.js @@ -118,49 +118,6 @@ async.waterfall([ gracefulShutdown(); }); - //serve timeslider.html under /p/$padname/timeslider - app.get('/p/:pad/:rev?/export/:type', function(req, res, next) - { - var types = ["pdf", "doc", "txt", "html", "odt", "dokuwiki"]; - //send a 404 if we don't support this filetype - if(types.indexOf(req.params.type) == -1) - { - next(); - return; - } - - //if abiword is disabled, and this is a format we only support with abiword, output a message - if(settings.abiword == null && - ["odt", "pdf", "doc"].indexOf(req.params.type) !== -1) - { - res.send("Abiword is not enabled at this Etherpad Lite instance. Set the path to Abiword in settings.json to enable this feature"); - return; - } - - res.header("Access-Control-Allow-Origin", "*"); - - hasPadAccess(req, res, function() - { - exportHandler.doExport(req, res, req.params.pad, req.params.type); - }); - }); - - //handle import requests - app.post('/p/:pad/import', function(req, res, next) - { - //if abiword is disabled, skip handling this request - if(settings.abiword == null) - { - next(); - return; - } - - hasPadAccess(req, res, function() - { - importHandler.doImport(req, res, req.params.pad); - }); - }); - //let the server listen app.listen(settings.port, settings.ip); diff --git a/pluginomatic.json b/pluginomatic.json index 498384e2..996aacdc 100644 --- a/pluginomatic.json +++ b/pluginomatic.json @@ -6,7 +6,8 @@ { "name": "minified", "hooks": { "expressCreateServer": "../minified:expressServer" } }, { "name": "padreadonly", "hooks": { "expressCreateServer": "../padreadonly:expressServer" } }, { "name": "webaccess", "hooks": { "expressConfigure": "../webaccess:expressConfigure" } }, - { "name": "apicalls", "hooks": { "expressCreateServer": "../apicalls:expressCreateServer" } } + { "name": "apicalls", "hooks": { "expressCreateServer": "../apicalls:expressCreateServer" } }, + { "name": "importexport", "hooks": { "expressCreateServer": "../importexport:expressCreateServer" } } ] } From 6a6191f67efa0b044abd8c773dec9286ccd124db Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Sat, 25 Feb 2012 16:20:40 +0100 Subject: [PATCH 022/297] Moved errorhandling --- node/errorhandling.js | 52 +++++++++++++++++++++++++++++++++++++++++++ node/server.js | 49 ---------------------------------------- pluginomatic.json | 3 ++- 3 files changed, 54 insertions(+), 50 deletions(-) create mode 100644 node/errorhandling.js diff --git a/node/errorhandling.js b/node/errorhandling.js new file mode 100644 index 00000000..1e8a734e --- /dev/null +++ b/node/errorhandling.js @@ -0,0 +1,52 @@ +var db = require('./db/DB'); +var os = require("os"); + + +exports.onShutdown = false; +exports.gracefulShutdown = function(err) { + if(err && err.stack) { + console.error(err.stack); + } else if(err) { + console.error(err); + } + + //ensure there is only one graceful shutdown running + if(exports.onShutdown) return; + exports.onShutdown = true; + + console.log("graceful shutdown..."); + + //stop the http server + exports.app.close(); + + //do the db shutdown + db.db.doShutdown(function() { + console.log("db sucessfully closed."); + + process.exit(0); + }); + + setTimeout(function(){ + process.exit(1); + }, 3000); +} + + +exports.expressCreateServer = function (hook_name, args, cb) { + exports.app = args.app; + + args.app.error(function(err, req, res, next){ + res.send(500); + console.error(err.stack ? err.stack : err.toString()); + exports.gracefulShutdown(); + }); + + //connect graceful shutdown with sigint and uncaughtexception + if(os.type().indexOf("Windows") == -1) { + //sigint is so far not working on windows + //https://github.com/joyent/node/issues/1553 + process.on('SIGINT', exports.gracefulShutdown); + } + + process.on('uncaughtException', exports.gracefulShutdown); +} diff --git a/node/server.js b/node/server.js index f97afd0f..abe12564 100644 --- a/node/server.js +++ b/node/server.js @@ -112,61 +112,12 @@ async.waterfall([ var httpLogger = log4js.getLogger("http"); app.configure(function() { hooks.callAll("expressConfigure", {"app": app}); }); - app.error(function(err, req, res, next){ - res.send(500); - console.error(err.stack ? err.stack : err.toString()); - gracefulShutdown(); - }); //let the server listen app.listen(settings.port, settings.ip); console.log("Server is listening at " + settings.ip + ":" + settings.port); - var onShutdown = false; - var gracefulShutdown = function(err) - { - if(err && err.stack) - { - console.error(err.stack); - } - else if(err) - { - console.error(err); - } - - //ensure there is only one graceful shutdown running - if(onShutdown) return; - onShutdown = true; - - console.log("graceful shutdown..."); - - //stop the http server - app.close(); - - //do the db shutdown - db.db.doShutdown(function() - { - console.log("db sucessfully closed."); - - process.exit(0); - }); - - setTimeout(function(){ - process.exit(1); - }, 3000); - } - - //connect graceful shutdown with sigint and uncaughtexception - if(os.type().indexOf("Windows") == -1) - { - //sigint is so far not working on windows - //https://github.com/joyent/node/issues/1553 - process.on('SIGINT', gracefulShutdown); - } - - process.on('uncaughtException', gracefulShutdown); - //init socket.io and redirect all requests to the MessageHandler var io = socketio.listen(app); diff --git a/pluginomatic.json b/pluginomatic.json index 996aacdc..bb2e0473 100644 --- a/pluginomatic.json +++ b/pluginomatic.json @@ -7,7 +7,8 @@ { "name": "padreadonly", "hooks": { "expressCreateServer": "../padreadonly:expressServer" } }, { "name": "webaccess", "hooks": { "expressConfigure": "../webaccess:expressConfigure" } }, { "name": "apicalls", "hooks": { "expressCreateServer": "../apicalls:expressCreateServer" } }, - { "name": "importexport", "hooks": { "expressCreateServer": "../importexport:expressCreateServer" } } + { "name": "importexport", "hooks": { "expressCreateServer": "../importexport:expressCreateServer" } }, + { "name": "errorhandling", "hooks": { "expressCreateServer": "../errorhandling:expressCreateServer" } } ] } From db38a43fd79f75fa1999460f86b039d382816bbf Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Sat, 25 Feb 2012 16:24:39 +0100 Subject: [PATCH 023/297] Some code cleanup --- node/server.js | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/node/server.js b/node/server.js index abe12564..c0bf49b1 100644 --- a/node/server.js +++ b/node/server.js @@ -96,28 +96,16 @@ async.waterfall([ res.header("Server", serverName); next(); }); - - //load modules that needs a initalized db - readOnlyManager = require("./db/ReadOnlyManager"); - exporthtml = require("./utils/ExportHtml"); - exportHandler = require('./handler/ExportHandler'); - importHandler = require('./handler/ImportHandler'); - apiHandler = require('./handler/APIHandler'); - padManager = require('./db/PadManager'); - securityManager = require('./db/SecurityManager'); - socketIORouter = require("./handler/SocketIORouter"); - hasPadAccess = require("./padaccess"); - //install logging - var httpLogger = log4js.getLogger("http"); app.configure(function() { hooks.callAll("expressConfigure", {"app": app}); }); - - //let the server listen app.listen(settings.port, settings.ip); console.log("Server is listening at " + settings.ip + ":" + settings.port); + + + //init socket.io and redirect all requests to the MessageHandler var io = socketio.listen(app); @@ -153,6 +141,7 @@ async.waterfall([ var timesliderMessageHandler = require("./handler/TimesliderMessageHandler"); //Initalize the Socket.IO Router + socketIORouter = require("./handler/SocketIORouter"); socketIORouter.setSocketIO(io); socketIORouter.addComponent("pad", padMessageHandler); socketIORouter.addComponent("timeslider", timesliderMessageHandler); From cddf71f6fe0f3305b226a234467053a1c9f89cc0 Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Sat, 25 Feb 2012 16:44:37 +0100 Subject: [PATCH 024/297] Moved socketio --- node/server.js | 43 ----------------------------------------- node/socketio.js | 49 +++++++++++++++++++++++++++++++++++++++++++++++ pluginomatic.json | 3 ++- 3 files changed, 51 insertions(+), 44 deletions(-) create mode 100644 node/socketio.js diff --git a/node/server.js b/node/server.js index c0bf49b1..bf2b1030 100644 --- a/node/server.js +++ b/node/server.js @@ -103,49 +103,6 @@ async.waterfall([ app.listen(settings.port, settings.ip); console.log("Server is listening at " + settings.ip + ":" + settings.port); - - - - //init socket.io and redirect all requests to the MessageHandler - var io = socketio.listen(app); - - //this is only a workaround to ensure it works with all browers behind a proxy - //we should remove this when the new socket.io version is more stable - io.set('transports', ['xhr-polling']); - - var socketIOLogger = log4js.getLogger("socket.io"); - io.set('logger', { - debug: function (str) - { - socketIOLogger.debug.apply(socketIOLogger, arguments); - }, - info: function (str) - { - socketIOLogger.info.apply(socketIOLogger, arguments); - }, - warn: function (str) - { - socketIOLogger.warn.apply(socketIOLogger, arguments); - }, - error: function (str) - { - socketIOLogger.error.apply(socketIOLogger, arguments); - }, - }); - - //minify socket.io javascript - if(settings.minify) - io.enable('browser client minification'); - - var padMessageHandler = require("./handler/PadMessageHandler"); - var timesliderMessageHandler = require("./handler/TimesliderMessageHandler"); - - //Initalize the Socket.IO Router - socketIORouter = require("./handler/SocketIORouter"); - socketIORouter.setSocketIO(io); - socketIORouter.addComponent("pad", padMessageHandler); - socketIORouter.addComponent("timeslider", timesliderMessageHandler); - callback(null); } ]); diff --git a/node/socketio.js b/node/socketio.js new file mode 100644 index 00000000..e6a4f95c --- /dev/null +++ b/node/socketio.js @@ -0,0 +1,49 @@ +var settings = require('./utils/Settings'); +var socketio = require('socket.io'); +var socketIORouter = require("./handler/SocketIORouter"); +var log4js = require('log4js'); +var hooks = require("./pluginfw/hooks"); + +var padMessageHandler = require("./handler/PadMessageHandler"); +var timesliderMessageHandler = require("./handler/TimesliderMessageHandler"); + + +exports.expressCreateServer = function (hook_name, args, cb) { + //init socket.io and redirect all requests to the MessageHandler + var io = socketio.listen(args.app); + + //this is only a workaround to ensure it works with all browers behind a proxy + //we should remove this when the new socket.io version is more stable + io.set('transports', ['xhr-polling']); + + var socketIOLogger = log4js.getLogger("socket.io"); + io.set('logger', { + debug: function (str) + { + socketIOLogger.debug.apply(socketIOLogger, arguments); + }, + info: function (str) + { + socketIOLogger.info.apply(socketIOLogger, arguments); + }, + warn: function (str) + { + socketIOLogger.warn.apply(socketIOLogger, arguments); + }, + error: function (str) + { + socketIOLogger.error.apply(socketIOLogger, arguments); + }, + }); + + //minify socket.io javascript + if(settings.minify) + io.enable('browser client minification'); + + //Initalize the Socket.IO Router + socketIORouter.setSocketIO(io); + socketIORouter.addComponent("pad", padMessageHandler); + socketIORouter.addComponent("timeslider", timesliderMessageHandler); + + hooks.callAll("socketio", {"app": args.app, "io": io}); +} diff --git a/pluginomatic.json b/pluginomatic.json index bb2e0473..04b61c31 100644 --- a/pluginomatic.json +++ b/pluginomatic.json @@ -8,7 +8,8 @@ { "name": "webaccess", "hooks": { "expressConfigure": "../webaccess:expressConfigure" } }, { "name": "apicalls", "hooks": { "expressCreateServer": "../apicalls:expressCreateServer" } }, { "name": "importexport", "hooks": { "expressCreateServer": "../importexport:expressCreateServer" } }, - { "name": "errorhandling", "hooks": { "expressCreateServer": "../errorhandling:expressCreateServer" } } + { "name": "errorhandling", "hooks": { "expressCreateServer": "../errorhandling:expressCreateServer" } }, + { "name": "socketio", "hooks": { "expressCreateServer": "../socketio:expressCreateServer" } } ] } From f2cfb4eee56d75ef760e193579b1f25cb3f755fa Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Sat, 25 Feb 2012 16:50:11 +0100 Subject: [PATCH 025/297] Removed some more junk --- node/server.js | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/node/server.js b/node/server.js index bf2b1030..7bd3f90b 100644 --- a/node/server.js +++ b/node/server.js @@ -20,28 +20,15 @@ * limitations under the License. */ -var ERR = require("async-stacktrace"); var log4js = require('log4js'); -var os = require("os"); -var socketio = require('socket.io'); var fs = require('fs'); var settings = require('./utils/Settings'); var db = require('./db/DB'); var async = require('async'); var express = require('express'); var path = require('path'); -var minify = require('./utils/Minify'); -var formidable = require('formidable'); var plugins = require("./pluginfw/plugins"); var hooks = require("./pluginfw/hooks"); -var apiHandler; -var exportHandler; -var importHandler; -var exporthtml; -var readOnlyManager; -var padManager; -var securityManager; -var socketIORouter; //try to get the git version var version = ""; From 6754eed9b418ccf9b41536e750565daa12662d1d Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Sat, 25 Feb 2012 16:53:15 +0100 Subject: [PATCH 026/297] Renamed functions to match hook names --- node/minified.js | 2 +- node/padreadonly.js | 2 +- node/padurlsanitize.js | 2 +- node/specialpages.js | 2 +- node/static.js | 2 +- pluginomatic.json | 10 +++++----- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/node/minified.js b/node/minified.js index 57978a1e..f0f050a7 100644 --- a/node/minified.js +++ b/node/minified.js @@ -1,6 +1,6 @@ var minify = require('./utils/Minify'); -exports.expressServer = function (hook_name, args, cb) { +exports.expressCreateServer = function (hook_name, args, cb) { //serve minified files args.app.get('/minified/:filename', minify.minifyJS); } diff --git a/node/padreadonly.js b/node/padreadonly.js index 50a5e06e..0121e7eb 100644 --- a/node/padreadonly.js +++ b/node/padreadonly.js @@ -4,7 +4,7 @@ var hasPadAccess = require("./padaccess"); var exporthtml = require("./utils/ExportHtml"); var ERR = require("async-stacktrace"); -exports.expressServer = function (hook_name, args, cb) { +exports.expressCreateServer = function (hook_name, args, cb) { //serve read only pad args.app.get('/ro/:id', function(req, res) { diff --git a/node/padurlsanitize.js b/node/padurlsanitize.js index b3885578..6fdd5f79 100644 --- a/node/padurlsanitize.js +++ b/node/padurlsanitize.js @@ -1,6 +1,6 @@ var padManager = require('./db/PadManager'); -exports.expressServer = function (hook_name, args, cb) { +exports.expressCreateServer = function (hook_name, args, cb) { //redirects browser to the pad's sanitized url if needed. otherwise, renders the html args.app.param('pad', function (req, res, next, padId) { //ensure the padname is valid and the url doesn't end with a / diff --git a/node/specialpages.js b/node/specialpages.js index 9a4bcb33..02509767 100644 --- a/node/specialpages.js +++ b/node/specialpages.js @@ -1,6 +1,6 @@ var path = require('path'); -exports.expressServer = function (hook_name, args, cb) { +exports.expressCreateServer = function (hook_name, args, cb) { //serve index.html under / args.app.get('/', function(req, res) diff --git a/node/static.js b/node/static.js index 71f40b45..a81227a4 100644 --- a/node/static.js +++ b/node/static.js @@ -1,7 +1,7 @@ var path = require('path'); var minify = require('./utils/Minify'); -exports.expressServer = function (hook_name, args, cb) { +exports.expressCreateServer = function (hook_name, args, cb) { //serve static files args.app.get('/static/js/require-kernel.js', function (req, res, next) { res.header("Content-Type","application/javascript; charset: utf-8"); diff --git a/pluginomatic.json b/pluginomatic.json index 04b61c31..e37d43a4 100644 --- a/pluginomatic.json +++ b/pluginomatic.json @@ -1,10 +1,10 @@ { "parts": [ - { "name": "static", "hooks": { "expressCreateServer": "../static:expressServer" } }, - { "name": "specialpages", "hooks": { "expressCreateServer": "../specialpages:expressServer" } }, - { "name": "padurlsanitize", "hooks": { "expressCreateServer": "../padurlsanitize:expressServer" } }, - { "name": "minified", "hooks": { "expressCreateServer": "../minified:expressServer" } }, - { "name": "padreadonly", "hooks": { "expressCreateServer": "../padreadonly:expressServer" } }, + { "name": "static", "hooks": { "expressCreateServer": "../static:expressCreateServer" } }, + { "name": "specialpages", "hooks": { "expressCreateServer": "../specialpages:expressCreateServer" } }, + { "name": "padurlsanitize", "hooks": { "expressCreateServer": "../padurlsanitize:expressCreateServer" } }, + { "name": "minified", "hooks": { "expressCreateServer": "../minified:expressCreateServer" } }, + { "name": "padreadonly", "hooks": { "expressCreateServer": "../padreadonly:expressCreateServer" } }, { "name": "webaccess", "hooks": { "expressConfigure": "../webaccess:expressConfigure" } }, { "name": "apicalls", "hooks": { "expressCreateServer": "../apicalls:expressCreateServer" } }, { "name": "importexport", "hooks": { "expressCreateServer": "../importexport:expressCreateServer" } }, From 7b429874071805b2928ef26eb7c157675e8e5182 Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Sat, 25 Feb 2012 17:23:44 +0100 Subject: [PATCH 027/297] Moved all the hooks into a hooks directory --- node/{ => hooks/express}/apicalls.js | 2 +- node/{ => hooks/express}/errorhandling.js | 2 +- node/{ => hooks/express}/importexport.js | 8 ++++---- node/{ => hooks/express}/minified.js | 2 +- node/{ => hooks/express}/padreadonly.js | 6 +++--- node/{ => hooks/express}/padurlsanitize.js | 2 +- node/{ => hooks/express}/socketio.js | 12 ++++++------ node/{ => hooks/express}/specialpages.js | 12 ++++++------ node/{ => hooks/express}/static.js | 4 ++-- node/{ => hooks/express}/webaccess.js | 2 +- pluginomatic.json | 20 ++++++++++---------- 11 files changed, 36 insertions(+), 36 deletions(-) rename node/{ => hooks/express}/apicalls.js (97%) rename node/{ => hooks/express}/errorhandling.js (97%) rename node/{ => hooks/express}/importexport.js (84%) rename node/{ => hooks/express}/minified.js (76%) rename node/{ => hooks/express}/padreadonly.js (88%) rename node/{ => hooks/express}/padurlsanitize.js (94%) rename node/{ => hooks/express}/socketio.js (80%) rename node/{ => hooks/express}/specialpages.js (68%) rename node/{ => hooks/express}/static.js (82%) rename node/{ => hooks/express}/webaccess.js (96%) diff --git a/node/apicalls.js b/node/hooks/express/apicalls.js similarity index 97% rename from node/apicalls.js rename to node/hooks/express/apicalls.js index 183f4411..8a9751eb 100644 --- a/node/apicalls.js +++ b/node/hooks/express/apicalls.js @@ -1,7 +1,7 @@ var log4js = require('log4js'); var apiLogger = log4js.getLogger("API"); -var apiHandler = require('./handler/APIHandler'); var formidable = require('formidable'); +var apiHandler = require('../../handler/APIHandler'); //This is for making an api call, collecting all post information and passing it to the apiHandler exports.apiCaller = function(req, res, fields) { diff --git a/node/errorhandling.js b/node/hooks/express/errorhandling.js similarity index 97% rename from node/errorhandling.js rename to node/hooks/express/errorhandling.js index 1e8a734e..cb8c5898 100644 --- a/node/errorhandling.js +++ b/node/hooks/express/errorhandling.js @@ -1,5 +1,5 @@ -var db = require('./db/DB'); var os = require("os"); +var db = require('../../db/DB'); exports.onShutdown = false; diff --git a/node/importexport.js b/node/hooks/express/importexport.js similarity index 84% rename from node/importexport.js rename to node/hooks/express/importexport.js index b53447da..9e78f34d 100644 --- a/node/importexport.js +++ b/node/hooks/express/importexport.js @@ -1,7 +1,7 @@ -var hasPadAccess = require("./padaccess"); -var settings = require('./utils/Settings'); -var exportHandler = require('./handler/ExportHandler'); -var importHandler = require('./handler/ImportHandler'); +var hasPadAccess = require("../../padaccess"); +var settings = require('../../utils/Settings'); +var exportHandler = require('../../handler/ExportHandler'); +var importHandler = require('../../handler/ImportHandler'); exports.expressCreateServer = function (hook_name, args, cb) { args.app.get('/p/:pad/:rev?/export/:type', function(req, res, next) { diff --git a/node/minified.js b/node/hooks/express/minified.js similarity index 76% rename from node/minified.js rename to node/hooks/express/minified.js index f0f050a7..09a08cae 100644 --- a/node/minified.js +++ b/node/hooks/express/minified.js @@ -1,4 +1,4 @@ -var minify = require('./utils/Minify'); +var minify = require('../../utils/Minify'); exports.expressCreateServer = function (hook_name, args, cb) { //serve minified files diff --git a/node/padreadonly.js b/node/hooks/express/padreadonly.js similarity index 88% rename from node/padreadonly.js rename to node/hooks/express/padreadonly.js index 0121e7eb..60ece0ad 100644 --- a/node/padreadonly.js +++ b/node/hooks/express/padreadonly.js @@ -1,8 +1,8 @@ var async = require('async'); -var readOnlyManager = require("./db/ReadOnlyManager"); -var hasPadAccess = require("./padaccess"); -var exporthtml = require("./utils/ExportHtml"); var ERR = require("async-stacktrace"); +var readOnlyManager = require("../../db/ReadOnlyManager"); +var hasPadAccess = require("../../padaccess"); +var exporthtml = require("../../utils/ExportHtml"); exports.expressCreateServer = function (hook_name, args, cb) { //serve read only pad diff --git a/node/padurlsanitize.js b/node/hooks/express/padurlsanitize.js similarity index 94% rename from node/padurlsanitize.js rename to node/hooks/express/padurlsanitize.js index 6fdd5f79..4f5dd7a5 100644 --- a/node/padurlsanitize.js +++ b/node/hooks/express/padurlsanitize.js @@ -1,4 +1,4 @@ -var padManager = require('./db/PadManager'); +var padManager = require('../../db/PadManager'); exports.expressCreateServer = function (hook_name, args, cb) { //redirects browser to the pad's sanitized url if needed. otherwise, renders the html diff --git a/node/socketio.js b/node/hooks/express/socketio.js similarity index 80% rename from node/socketio.js rename to node/hooks/express/socketio.js index e6a4f95c..bc65c7b7 100644 --- a/node/socketio.js +++ b/node/hooks/express/socketio.js @@ -1,11 +1,11 @@ -var settings = require('./utils/Settings'); -var socketio = require('socket.io'); -var socketIORouter = require("./handler/SocketIORouter"); var log4js = require('log4js'); -var hooks = require("./pluginfw/hooks"); +var socketio = require('socket.io'); +var settings = require('../../utils/Settings'); +var socketIORouter = require("../../handler/SocketIORouter"); +var hooks = require("../../pluginfw/hooks"); -var padMessageHandler = require("./handler/PadMessageHandler"); -var timesliderMessageHandler = require("./handler/TimesliderMessageHandler"); +var padMessageHandler = require("../../handler/PadMessageHandler"); +var timesliderMessageHandler = require("../../handler/TimesliderMessageHandler"); exports.expressCreateServer = function (hook_name, args, cb) { diff --git a/node/specialpages.js b/node/hooks/express/specialpages.js similarity index 68% rename from node/specialpages.js rename to node/hooks/express/specialpages.js index 02509767..13cfd821 100644 --- a/node/specialpages.js +++ b/node/hooks/express/specialpages.js @@ -5,27 +5,27 @@ exports.expressCreateServer = function (hook_name, args, cb) { //serve index.html under / args.app.get('/', function(req, res) { - var filePath = path.normalize(__dirname + "/../static/index.html"); + var filePath = path.normalize(__dirname + "/../../../static/index.html"); res.sendfile(filePath, { maxAge: exports.maxAge }); }); //serve robots.txt args.app.get('/robots.txt', function(req, res) { - var filePath = path.normalize(__dirname + "/../static/robots.txt"); + var filePath = path.normalize(__dirname + "/../../../static/robots.txt"); res.sendfile(filePath, { maxAge: exports.maxAge }); }); //serve favicon.ico args.app.get('/favicon.ico', function(req, res) { - var filePath = path.normalize(__dirname + "/../static/custom/favicon.ico"); + var filePath = path.normalize(__dirname + "/../../../static/custom/favicon.ico"); res.sendfile(filePath, { maxAge: exports.maxAge }, function(err) { //there is no custom favicon, send the default favicon if(err) { - filePath = path.normalize(__dirname + "/../static/favicon.ico"); + filePath = path.normalize(__dirname + "/../../../static/favicon.ico"); res.sendfile(filePath, { maxAge: exports.maxAge }); } }); @@ -34,14 +34,14 @@ exports.expressCreateServer = function (hook_name, args, cb) { //serve pad.html under /p args.app.get('/p/:pad', function(req, res, next) { - var filePath = path.normalize(__dirname + "/../static/pad.html"); + var filePath = path.normalize(__dirname + "/../../../static/pad.html"); res.sendfile(filePath, { maxAge: exports.maxAge }); }); //serve timeslider.html under /p/$padname/timeslider args.app.get('/p/:pad/timeslider', function(req, res, next) { - var filePath = path.normalize(__dirname + "/../static/timeslider.html"); + var filePath = path.normalize(__dirname + "/../../../static/timeslider.html"); res.sendfile(filePath, { maxAge: exports.maxAge }); }); diff --git a/node/static.js b/node/hooks/express/static.js similarity index 82% rename from node/static.js rename to node/hooks/express/static.js index a81227a4..99f6eeff 100644 --- a/node/static.js +++ b/node/hooks/express/static.js @@ -1,5 +1,5 @@ var path = require('path'); -var minify = require('./utils/Minify'); +var minify = require('../../utils/Minify'); exports.expressCreateServer = function (hook_name, args, cb) { //serve static files @@ -10,7 +10,7 @@ exports.expressCreateServer = function (hook_name, args, cb) { }); args.app.get('/static/*', function(req, res) { - var filePath = path.normalize(__dirname + "/.." + + var filePath = path.normalize(__dirname + "/../../.." + req.url.replace(/\.\./g, '').split("?")[0]); res.sendfile(filePath, { maxAge: exports.maxAge }); }); diff --git a/node/webaccess.js b/node/hooks/express/webaccess.js similarity index 96% rename from node/webaccess.js rename to node/hooks/express/webaccess.js index 05c398a0..8e9f967a 100644 --- a/node/webaccess.js +++ b/node/hooks/express/webaccess.js @@ -1,7 +1,7 @@ -var settings = require('./utils/Settings'); var express = require('express'); var log4js = require('log4js'); var httpLogger = log4js.getLogger("http"); +var settings = require('../../utils/Settings'); //checks for basic http auth diff --git a/pluginomatic.json b/pluginomatic.json index e37d43a4..0c777c47 100644 --- a/pluginomatic.json +++ b/pluginomatic.json @@ -1,15 +1,15 @@ { "parts": [ - { "name": "static", "hooks": { "expressCreateServer": "../static:expressCreateServer" } }, - { "name": "specialpages", "hooks": { "expressCreateServer": "../specialpages:expressCreateServer" } }, - { "name": "padurlsanitize", "hooks": { "expressCreateServer": "../padurlsanitize:expressCreateServer" } }, - { "name": "minified", "hooks": { "expressCreateServer": "../minified:expressCreateServer" } }, - { "name": "padreadonly", "hooks": { "expressCreateServer": "../padreadonly:expressCreateServer" } }, - { "name": "webaccess", "hooks": { "expressConfigure": "../webaccess:expressConfigure" } }, - { "name": "apicalls", "hooks": { "expressCreateServer": "../apicalls:expressCreateServer" } }, - { "name": "importexport", "hooks": { "expressCreateServer": "../importexport:expressCreateServer" } }, - { "name": "errorhandling", "hooks": { "expressCreateServer": "../errorhandling:expressCreateServer" } }, - { "name": "socketio", "hooks": { "expressCreateServer": "../socketio:expressCreateServer" } } + { "name": "static", "hooks": { "expressCreateServer": "../hooks/express/static:expressCreateServer" } }, + { "name": "specialpages", "hooks": { "expressCreateServer": "../hooks/express/specialpages:expressCreateServer" } }, + { "name": "padurlsanitize", "hooks": { "expressCreateServer": "../hooks/express/padurlsanitize:expressCreateServer" } }, + { "name": "minified", "hooks": { "expressCreateServer": "../hooks/express/minified:expressCreateServer" } }, + { "name": "padreadonly", "hooks": { "expressCreateServer": "../hooks/express/padreadonly:expressCreateServer" } }, + { "name": "webaccess", "hooks": { "expressConfigure": "../hooks/express/webaccess:expressConfigure" } }, + { "name": "apicalls", "hooks": { "expressCreateServer": "../hooks/express/apicalls:expressCreateServer" } }, + { "name": "importexport", "hooks": { "expressCreateServer": "../hooks/express/importexport:expressCreateServer" } }, + { "name": "errorhandling", "hooks": { "expressCreateServer": "../hooks/express/errorhandling:expressCreateServer" } }, + { "name": "socketio", "hooks": { "expressCreateServer": "../hooks/express/socketio:expressCreateServer" } } ] } From 1d86c828bc47db69b6b61f4cf996da7352ba7ff9 Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Sat, 25 Feb 2012 17:58:25 +0100 Subject: [PATCH 028/297] Bugfix for plugin listing --- node/pluginfw/plugins.js | 1 + 1 file changed, 1 insertion(+) diff --git a/node/pluginfw/plugins.js b/node/pluginfw/plugins.js index 2c0c00ff..e66477ad 100644 --- a/node/pluginfw/plugins.js +++ b/node/pluginfw/plugins.js @@ -116,6 +116,7 @@ exports.loadPlugin = function (packages, plugin_name, plugins, parts, cb) { function (er, data) { var plugin = JSON.parse(data); plugin.package = packages[plugin_name]; + plugins[plugin_name] = plugin; plugin.parts.forEach(function (part) { part.plugin = plugin; part.full_name = plugin_name + "/" + part.name; From e542199aab53089921a41dcd0b9b98effe48f20b Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Sat, 25 Feb 2012 19:43:00 +0100 Subject: [PATCH 029/297] Serve plugin static files --- node/hooks/express/static.js | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/node/hooks/express/static.js b/node/hooks/express/static.js index 99f6eeff..937fb26e 100644 --- a/node/hooks/express/static.js +++ b/node/hooks/express/static.js @@ -1,5 +1,6 @@ var path = require('path'); var minify = require('../../utils/Minify'); +var plugins = require("../../pluginfw/plugins"); exports.expressCreateServer = function (hook_name, args, cb) { //serve static files @@ -8,8 +9,19 @@ exports.expressCreateServer = function (hook_name, args, cb) { res.write(minify.requireDefinition()); res.end(); }); - args.app.get('/static/*', function(req, res) - { + + args.app.get('/static/plugins/*', function(req, res) { + var url = req.url.replace(/\.\./g, '').split("?")[0]; + url = url.split("/"); + url.splice(0, 3); + var plugin_name = url.splice(0, 1)[0]; + url = url.join("/"); + + var filePath = path.normalize(path.join(plugins.plugins[plugin_name].package.path, "static", url)); + res.sendfile(filePath, { maxAge: exports.maxAge }); + }); + + args.app.get('/static/*', function(req, res) { var filePath = path.normalize(__dirname + "/../../.." + req.url.replace(/\.\./g, '').split("?")[0]); res.sendfile(filePath, { maxAge: exports.maxAge }); From ce35f209884e7bccacb2b6b0277fe9afc0f151c5 Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Sat, 25 Feb 2012 19:43:22 +0100 Subject: [PATCH 030/297] Make plugins dict non-recursive --- node/pluginfw/plugins.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/node/pluginfw/plugins.js b/node/pluginfw/plugins.js index e66477ad..3b93a018 100644 --- a/node/pluginfw/plugins.js +++ b/node/pluginfw/plugins.js @@ -6,6 +6,7 @@ var path = require("path"); var async = require("async"); var fs = require("fs"); var tsort = require("./tsort"); +var util = require("util"); exports.prefix = 'pluginomatic_'; exports.loaded = false; @@ -65,6 +66,7 @@ exports.getPlugins = function (cb) { function (err) { parts = exports.sortParts(parts); var hooks = exports.extractHooks(parts); +// console.log(util.inspect(plugins, undefined, null)); cb(err, plugins, parts, hooks); } ); @@ -118,7 +120,7 @@ exports.loadPlugin = function (packages, plugin_name, plugins, parts, cb) { plugin.package = packages[plugin_name]; plugins[plugin_name] = plugin; plugin.parts.forEach(function (part) { - part.plugin = plugin; + part.plugin = plugin_name; part.full_name = plugin_name + "/" + part.name; parts[part.full_name] = part; }); From 261bbd460feba2dce6ecab9ea06b98d42eceeb93 Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Sat, 25 Feb 2012 19:43:39 +0100 Subject: [PATCH 031/297] test static files for plugins --- available_plugins/pluginomatic_fintest/static/test.html | 1 + 1 file changed, 1 insertion(+) create mode 100644 available_plugins/pluginomatic_fintest/static/test.html diff --git a/available_plugins/pluginomatic_fintest/static/test.html b/available_plugins/pluginomatic_fintest/static/test.html new file mode 100644 index 00000000..9e7fc551 --- /dev/null +++ b/available_plugins/pluginomatic_fintest/static/test.html @@ -0,0 +1 @@ +Test bla bla From 2a58a62dcc95185983f74f8946f800f32c04ef24 Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Sun, 26 Feb 2012 00:45:06 +0100 Subject: [PATCH 032/297] Client side / server side require --- .../pluginomatic_fintest/otherpart.js | 3 ++ .../pluginomatic_fintest/package.json | 2 +- .../pluginomatic_fintest/pluginomatic.json | 2 +- .../pluginomatic_fintest/static/js/test.js | 1 + node/hooks/express/static.js | 17 ++++---- node/pluginfw/require.js | 42 +++++++++++++++++++ node/server.js | 1 + 7 files changed, 59 insertions(+), 9 deletions(-) create mode 100644 available_plugins/pluginomatic_fintest/static/js/test.js create mode 100644 node/pluginfw/require.js diff --git a/available_plugins/pluginomatic_fintest/otherpart.js b/available_plugins/pluginomatic_fintest/otherpart.js index f2a94d35..9710fa4e 100644 --- a/available_plugins/pluginomatic_fintest/otherpart.js +++ b/available_plugins/pluginomatic_fintest/otherpart.js @@ -7,6 +7,9 @@ exports.morehook = function (hook_name, args, cb) { } exports.expressServer = function (hook_name, args, cb) { + test = ep_client_require("/plugins/pluginomatic_fintest/test.js"); + console.log("FOOO:", test.foo); + args.app.get('/otherpart', function(req, res) { res.send("Abra cadabra"); }); diff --git a/available_plugins/pluginomatic_fintest/package.json b/available_plugins/pluginomatic_fintest/package.json index d5b0531b..8ee3fd36 100644 --- a/available_plugins/pluginomatic_fintest/package.json +++ b/available_plugins/pluginomatic_fintest/package.json @@ -4,6 +4,6 @@ "version": "0.0.1", "author": "RedHog (Egil Moeller) ", "contributors": [], - "dependencies": {}, + "dependencies": {"etherpad-lite": "1"}, "engines": { "node": ">= 0.4.1 < 0.7.0" } } diff --git a/available_plugins/pluginomatic_fintest/pluginomatic.json b/available_plugins/pluginomatic_fintest/pluginomatic.json index 3b34c7ce..0e94dc17 100644 --- a/available_plugins/pluginomatic_fintest/pluginomatic.json +++ b/available_plugins/pluginomatic_fintest/pluginomatic.json @@ -25,7 +25,7 @@ "hooks": { "somehookname": "pluginomatic_fintest/otherpart:somehook", "morehook": "pluginomatic_fintest/otherpart:morehook", - "expressServer": "pluginomatic_fintest/otherpart:expressServer" + "expressCreateServer": "pluginomatic_fintest/otherpart:expressServer" } } ] diff --git a/available_plugins/pluginomatic_fintest/static/js/test.js b/available_plugins/pluginomatic_fintest/static/js/test.js new file mode 100644 index 00000000..7dc8e61a --- /dev/null +++ b/available_plugins/pluginomatic_fintest/static/js/test.js @@ -0,0 +1 @@ +exports.foo = 42; diff --git a/node/hooks/express/static.js b/node/hooks/express/static.js index 937fb26e..a160423d 100644 --- a/node/hooks/express/static.js +++ b/node/hooks/express/static.js @@ -10,17 +10,20 @@ exports.expressCreateServer = function (hook_name, args, cb) { res.end(); }); - args.app.get('/static/plugins/*', function(req, res) { - var url = req.url.replace(/\.\./g, '').split("?")[0]; - url = url.split("/"); - url.splice(0, 3); - var plugin_name = url.splice(0, 1)[0]; - url = url.join("/"); + /* Handle paths like "/static/js/plugins/pluginomatic_myplugin/test.js" + by rewriting it to ROOT_PATH_OF_MYPLUGIN/static/js/test.js, + commonly ETHERPAD_ROOT/node_modules/pluginomatic_myplugin/static/js/test.js + */ + args.app.get(/^\/static\/([^\/]+)\/plugins\/([^\/]+)\/(.*)/, function(req, res) { + var type_dir = req.params[0].replace(/\.\./g, '').split("?")[0]; + var plugin_name = req.params[1]; + var url = req.params[2].replace(/\.\./g, '').split("?")[0]; - var filePath = path.normalize(path.join(plugins.plugins[plugin_name].package.path, "static", url)); + var filePath = path.normalize(path.join(plugins.plugins[plugin_name].package.path, "static", type_dir, url)); res.sendfile(filePath, { maxAge: exports.maxAge }); }); + // Handle normal static files args.app.get('/static/*', function(req, res) { var filePath = path.normalize(__dirname + "/../../.." + req.url.replace(/\.\./g, '').split("?")[0]); diff --git a/node/pluginfw/require.js b/node/pluginfw/require.js new file mode 100644 index 00000000..887c5549 --- /dev/null +++ b/node/pluginfw/require.js @@ -0,0 +1,42 @@ +var plugins = require('./plugins'); +var path = require('path'); + +var SERVER_JS_SRC = path.normalize(path.join(__dirname, '../../')); +var CLIENT_JS_SRC = path.normalize(path.join(__dirname, '../../static/js')); + +global.ep_require = function (url) { + if (url.indexOf("/plugins/") == 0) { + /* Handle paths like "/plugins/pluginomatic_myplugin/test.js" + by rewriting it to ROOT_PATH_OF_MYPLUGIN/test.js, + commonly ETHERPAD_ROOT/node_modules/pluginomatic_myplugin/test.js + */ + url = url.split("/"); + url.splice(0, 1); + var plugin_name = url.splice(0, 1)[0]; + url = url.join("/"); + url = path.normalize(path.join(plugins.plugins[plugin_name].package.path, url)); + } else if (url.indexOf("/") == 0) { + /* Handle all non-plugin paths for files in / */ + url = path.normalize(path.join(SERVER_JS_SRC, url)) + } + return require(url); +} + +global.ep_client_require = function (url) { + if (url.indexOf("/plugins/") == 0) { + /* Handle paths like "/plugins/pluginomatic_myplugin/test.js" + by rewriting it to ROOT_PATH_OF_MYPLUGIN/static/js/test.js, + commonly ETHERPAD_ROOT/node_modules/pluginomatic_myplugin/static/js/test.js + For more information see hooks/express/static.js + */ + url = url.split("/"); + url.splice(0, 2); + var plugin_name = url.splice(0, 1)[0]; + url = url.join("/"); + url = path.normalize(path.join(plugins.plugins[plugin_name].package.path, "static/js", url)); + } else if (url.indexOf("/") == 0) { + /* Handle all non-plugin paths for files in /static */ + url = path.normalize(path.join(CLIENT_JS_SRC, url)) + } + return require(url); +} diff --git a/node/server.js b/node/server.js index 7bd3f90b..ff7aba96 100644 --- a/node/server.js +++ b/node/server.js @@ -27,6 +27,7 @@ var db = require('./db/DB'); var async = require('async'); var express = require('express'); var path = require('path'); +require("./pluginfw/require"); // Load globals var plugins = require("./pluginfw/plugins"); var hooks = require("./pluginfw/hooks"); From 1955bdec9a0f0448e5b04638f0e69ed3b9210f39 Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Sun, 26 Feb 2012 00:59:05 +0100 Subject: [PATCH 033/297] plugins.plugins is now defined while loading hook modules from plugins --- .../pluginomatic_fintest/otherpart.js | 6 ++--- node/pluginfw/plugins.js | 25 ++++++------------- 2 files changed, 11 insertions(+), 20 deletions(-) diff --git a/available_plugins/pluginomatic_fintest/otherpart.js b/available_plugins/pluginomatic_fintest/otherpart.js index 9710fa4e..bf9bf1de 100644 --- a/available_plugins/pluginomatic_fintest/otherpart.js +++ b/available_plugins/pluginomatic_fintest/otherpart.js @@ -1,3 +1,6 @@ +test = ep_client_require("/plugins/pluginomatic_fintest/test.js"); +console.log("FOOO:", test.foo); + exports.somehook = function (hook_name, args, cb) { return cb(["otherpart:somehook was here"]); } @@ -7,9 +10,6 @@ exports.morehook = function (hook_name, args, cb) { } exports.expressServer = function (hook_name, args, cb) { - test = ep_client_require("/plugins/pluginomatic_fintest/test.js"); - console.log("FOOO:", test.foo); - args.app.get('/otherpart', function(req, res) { res.send("Abra cadabra"); }); diff --git a/node/pluginfw/plugins.js b/node/pluginfw/plugins.js index 3b93a018..cf26e9b0 100644 --- a/node/pluginfw/plugins.js +++ b/node/pluginfw/plugins.js @@ -21,16 +21,6 @@ exports.ensure = function (cb) { cb(); } -exports.update = function (cb) { - exports.getPlugins(function (er, plugins, parts, hooks) { - exports.plugins = plugins; - exports.parts = parts; - exports.hooks = hooks; - exports.loaded = true; - cb(er); - }); -} - exports.formatPlugins = function () { return Object.keys(exports.plugins).join(", "); } @@ -49,13 +39,13 @@ exports.formatHooks = function () { return res.join("\n"); } -exports.getPlugins = function (cb) { +exports.update = function (cb) { exports.getPackages(function (er, packages) { packages.__builtin__ = { "path": path.resolve(npm.dir, "../..") }; - var parts = {}; + var parts = []; var plugins = {}; // Load plugin metadata pluginomatic.json async.forEach( @@ -64,10 +54,11 @@ exports.getPlugins = function (cb) { exports.loadPlugin(packages, plugin_name, plugins, parts, cb); }, function (err) { - parts = exports.sortParts(parts); - var hooks = exports.extractHooks(parts); -// console.log(util.inspect(plugins, undefined, null)); - cb(err, plugins, parts, hooks); + exports.plugins = plugins; + exports.parts = exports.sortParts(parts); + exports.hooks = exports.extractHooks(exports.parts); + exports.loaded = true; + cb(err); } ); }); @@ -99,7 +90,7 @@ exports.extractHooks = function (parts) { parts.forEach(function (part) { Object.keys(part.hooks || {}).forEach(function (hook_name) { if (hooks[hook_name] === undefined) hooks[hook_name] = []; - var hook_fn_name = part.hooks[hook_name]; + var hook_fn_name = part.hooks[hook_name]; var hook_fn = exports.loadFn(part.hooks[hook_name]); if (hook_fn) { hooks[hook_name].push({"hook_name": hook_name, "hook_fn": hook_fn, "hook_fn_name": hook_fn_name, "part": part}); From 1239ce7f284821ad4ce51f8219c480ff557a5b86 Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Sun, 26 Feb 2012 13:07:51 +0100 Subject: [PATCH 034/297] The Big Renaming - etherpad is now an NPM module --- bin/debugRun.sh | 2 +- bin/run.sh | 6 +- {node => src/node}/README.md | 0 {node => src/node}/db/API.js | 0 {node => src/node}/db/AuthorManager.js | 0 {node => src/node}/db/DB.js | 0 {node => src/node}/db/GroupManager.js | 0 {node => src/node}/db/Pad.js | 0 {node => src/node}/db/PadManager.js | 0 {node => src/node}/db/ReadOnlyManager.js | 0 {node => src/node}/db/SecurityManager.js | 0 {node => src/node}/db/SessionManager.js | 0 {node => src/node}/easysync_tests.js | 0 {node => src/node}/handler/APIHandler.js | 0 {node => src/node}/handler/ExportHandler.js | 0 {node => src/node}/handler/ImportHandler.js | 0 .../node}/handler/PadMessageHandler.js | 0 {node => src/node}/handler/SocketIORouter.js | 0 .../node}/handler/TimesliderMessageHandler.js | 0 {node => src/node}/hooks/express/apicalls.js | 0 .../node}/hooks/express/errorhandling.js | 0 .../node}/hooks/express/importexport.js | 0 {node => src/node}/hooks/express/minified.js | 0 .../node}/hooks/express/padreadonly.js | 0 .../node}/hooks/express/padurlsanitize.js | 0 {node => src/node}/hooks/express/socketio.js | 0 .../node}/hooks/express/specialpages.js | 0 {node => src/node}/hooks/express/static.js | 0 {node => src/node}/hooks/express/webaccess.js | 0 {node => src/node}/padaccess.js | 0 {node => src/node}/pluginfw/hooks.js | 0 {node => src/node}/pluginfw/plugins.js | 31 +- {node => src/node}/pluginfw/require.js | 0 {node => src/node}/pluginfw/tsort.js | 0 {node => src/node}/server.js | 0 {node => src/node}/utils/Abiword.js | 0 {node => src/node}/utils/Cli.js | 0 {node => src/node}/utils/ExportDokuWiki.js | 0 {node => src/node}/utils/ExportHtml.js | 0 {node => src/node}/utils/ImportHtml.js | 0 {node => src/node}/utils/Minify.js | 10 +- {node => src/node}/utils/Settings.js | 12 +- {node => src/node}/utils/common_code.js | 0 {node => src/node}/utils/customError.js | 0 {node => src/node}/utils/tar.json | 0 package.json => src/package.json | 2 +- pluginomatic.json => src/pluginomatic.json | 0 {static => src/static}/css/iframe_editor.css | 0 {static => src/static}/css/pad.css | 0 {static => src/static}/css/timeslider.css | 0 {static => src/static}/custom/css.template | 0 {static => src/static}/custom/js.template | 0 {static => src/static}/favicon.ico | Bin {static => src/static}/img/backgrad.gif | Bin {static => src/static}/img/connectingbar.gif | Bin .../static}/img/crushed_button_depressed.png | Bin .../img/crushed_button_undepressed.png | Bin .../static}/img/crushed_current_location.png | Bin .../static}/img/etherpad_lite_icons.png | Bin {static => src/static}/img/fileicons.gif | Bin {static => src/static}/img/leftarrow.png | Bin {static => src/static}/img/loading.gif | Bin {static => src/static}/img/pause.png | Bin {static => src/static}/img/play.png | Bin .../static}/img/roundcorner_left.gif | Bin .../static}/img/roundcorner_right.gif | Bin .../static}/img/stepper_buttons.png | Bin .../static}/img/timeslider_background.png | Bin .../static}/img/timeslider_left.png | Bin .../static}/img/timeslider_right.png | Bin {static => src/static}/index.html | 0 .../static}/js/AttributePoolFactory.js | 0 {static => src/static}/js/Changeset.js | 0 {static => src/static}/js/ace.js | 0 {static => src/static}/js/ace2_common.js | 0 {static => src/static}/js/ace2_inner.js | 0 {static => src/static}/js/broadcast.js | 0 .../static}/js/broadcast_revisions.js | 0 {static => src/static}/js/broadcast_slider.js | 0 {static => src/static}/js/changesettracker.js | 0 {static => src/static}/js/chat.js | 0 {static => src/static}/js/collab_client.js | 0 {static => src/static}/js/colorutils.js | 0 {static => src/static}/js/contentcollector.js | 0 {static => src/static}/js/cssmanager.js | 0 {static => src/static}/js/domline.js | 0 {static => src/static}/js/draggable.js | 0 {static => src/static}/js/excanvas.js | 0 {static => src/static}/js/farbtastic.js | 0 src/static/js/jquery.js | 9266 +++++++++++++++++ {static => src/static}/js/json2.js | 0 {static => src/static}/js/linestylefilter.js | 0 {static => src/static}/js/pad.js | 0 .../static}/js/pad_connectionstatus.js | 0 {static => src/static}/js/pad_cookie.js | 0 {static => src/static}/js/pad_docbar.js | 0 {static => src/static}/js/pad_editbar.js | 0 {static => src/static}/js/pad_editor.js | 0 {static => src/static}/js/pad_impexp.js | 0 {static => src/static}/js/pad_modals.js | 0 {static => src/static}/js/pad_savedrevs.js | 0 {static => src/static}/js/pad_userlist.js | 0 {static => src/static}/js/pad_utils.js | 0 {static => src/static}/js/plugins.js | 0 src/static/js/prefixfree.js | 419 + {static => src/static}/js/security.js | 0 {static => src/static}/js/skiplist.js | 0 {static => src/static}/js/timeslider.js | 0 {static => src/static}/js/undo-xpopup.js | 0 {static => src/static}/js/undomodule.js | 0 {static => src/static}/js/virtual_lines.js | 0 {static => src/static}/pad.html | 0 {static => src/static}/robots.txt | 0 {static => src/static}/tests.html | 0 {static => src/static}/timeslider.html | 0 static/custom/.gitignore | 3 - 116 files changed, 9721 insertions(+), 30 deletions(-) rename {node => src/node}/README.md (100%) rename {node => src/node}/db/API.js (100%) rename {node => src/node}/db/AuthorManager.js (100%) rename {node => src/node}/db/DB.js (100%) rename {node => src/node}/db/GroupManager.js (100%) rename {node => src/node}/db/Pad.js (100%) rename {node => src/node}/db/PadManager.js (100%) rename {node => src/node}/db/ReadOnlyManager.js (100%) rename {node => src/node}/db/SecurityManager.js (100%) rename {node => src/node}/db/SessionManager.js (100%) rename {node => src/node}/easysync_tests.js (100%) rename {node => src/node}/handler/APIHandler.js (100%) rename {node => src/node}/handler/ExportHandler.js (100%) rename {node => src/node}/handler/ImportHandler.js (100%) rename {node => src/node}/handler/PadMessageHandler.js (100%) rename {node => src/node}/handler/SocketIORouter.js (100%) rename {node => src/node}/handler/TimesliderMessageHandler.js (100%) rename {node => src/node}/hooks/express/apicalls.js (100%) rename {node => src/node}/hooks/express/errorhandling.js (100%) rename {node => src/node}/hooks/express/importexport.js (100%) rename {node => src/node}/hooks/express/minified.js (100%) rename {node => src/node}/hooks/express/padreadonly.js (100%) rename {node => src/node}/hooks/express/padurlsanitize.js (100%) rename {node => src/node}/hooks/express/socketio.js (100%) rename {node => src/node}/hooks/express/specialpages.js (100%) rename {node => src/node}/hooks/express/static.js (100%) rename {node => src/node}/hooks/express/webaccess.js (100%) rename {node => src/node}/padaccess.js (100%) rename {node => src/node}/pluginfw/hooks.js (100%) rename {node => src/node}/pluginfw/plugins.js (87%) rename {node => src/node}/pluginfw/require.js (100%) rename {node => src/node}/pluginfw/tsort.js (100%) rename {node => src/node}/server.js (100%) rename {node => src/node}/utils/Abiword.js (100%) rename {node => src/node}/utils/Cli.js (100%) rename {node => src/node}/utils/ExportDokuWiki.js (100%) rename {node => src/node}/utils/ExportHtml.js (100%) rename {node => src/node}/utils/ImportHtml.js (100%) rename {node => src/node}/utils/Minify.js (96%) rename {node => src/node}/utils/Settings.js (89%) rename {node => src/node}/utils/common_code.js (100%) rename {node => src/node}/utils/customError.js (100%) rename {node => src/node}/utils/tar.json (100%) rename package.json => src/package.json (96%) rename pluginomatic.json => src/pluginomatic.json (100%) rename {static => src/static}/css/iframe_editor.css (100%) rename {static => src/static}/css/pad.css (100%) rename {static => src/static}/css/timeslider.css (100%) rename {static => src/static}/custom/css.template (100%) rename {static => src/static}/custom/js.template (100%) rename {static => src/static}/favicon.ico (100%) rename {static => src/static}/img/backgrad.gif (100%) rename {static => src/static}/img/connectingbar.gif (100%) rename {static => src/static}/img/crushed_button_depressed.png (100%) rename {static => src/static}/img/crushed_button_undepressed.png (100%) rename {static => src/static}/img/crushed_current_location.png (100%) rename {static => src/static}/img/etherpad_lite_icons.png (100%) rename {static => src/static}/img/fileicons.gif (100%) rename {static => src/static}/img/leftarrow.png (100%) rename {static => src/static}/img/loading.gif (100%) rename {static => src/static}/img/pause.png (100%) rename {static => src/static}/img/play.png (100%) rename {static => src/static}/img/roundcorner_left.gif (100%) rename {static => src/static}/img/roundcorner_right.gif (100%) rename {static => src/static}/img/stepper_buttons.png (100%) rename {static => src/static}/img/timeslider_background.png (100%) rename {static => src/static}/img/timeslider_left.png (100%) rename {static => src/static}/img/timeslider_right.png (100%) rename {static => src/static}/index.html (100%) rename {static => src/static}/js/AttributePoolFactory.js (100%) rename {static => src/static}/js/Changeset.js (100%) rename {static => src/static}/js/ace.js (100%) rename {static => src/static}/js/ace2_common.js (100%) rename {static => src/static}/js/ace2_inner.js (100%) rename {static => src/static}/js/broadcast.js (100%) rename {static => src/static}/js/broadcast_revisions.js (100%) rename {static => src/static}/js/broadcast_slider.js (100%) rename {static => src/static}/js/changesettracker.js (100%) rename {static => src/static}/js/chat.js (100%) rename {static => src/static}/js/collab_client.js (100%) rename {static => src/static}/js/colorutils.js (100%) rename {static => src/static}/js/contentcollector.js (100%) rename {static => src/static}/js/cssmanager.js (100%) rename {static => src/static}/js/domline.js (100%) rename {static => src/static}/js/draggable.js (100%) rename {static => src/static}/js/excanvas.js (100%) rename {static => src/static}/js/farbtastic.js (100%) create mode 100644 src/static/js/jquery.js rename {static => src/static}/js/json2.js (100%) rename {static => src/static}/js/linestylefilter.js (100%) rename {static => src/static}/js/pad.js (100%) rename {static => src/static}/js/pad_connectionstatus.js (100%) rename {static => src/static}/js/pad_cookie.js (100%) rename {static => src/static}/js/pad_docbar.js (100%) rename {static => src/static}/js/pad_editbar.js (100%) rename {static => src/static}/js/pad_editor.js (100%) rename {static => src/static}/js/pad_impexp.js (100%) rename {static => src/static}/js/pad_modals.js (100%) rename {static => src/static}/js/pad_savedrevs.js (100%) rename {static => src/static}/js/pad_userlist.js (100%) rename {static => src/static}/js/pad_utils.js (100%) rename {static => src/static}/js/plugins.js (100%) create mode 100644 src/static/js/prefixfree.js rename {static => src/static}/js/security.js (100%) rename {static => src/static}/js/skiplist.js (100%) rename {static => src/static}/js/timeslider.js (100%) rename {static => src/static}/js/undo-xpopup.js (100%) rename {static => src/static}/js/undomodule.js (100%) rename {static => src/static}/js/virtual_lines.js (100%) rename {static => src/static}/pad.html (100%) rename {static => src/static}/robots.txt (100%) rename {static => src/static}/tests.html (100%) rename {static => src/static}/timeslider.html (100%) delete mode 100644 static/custom/.gitignore diff --git a/bin/debugRun.sh b/bin/debugRun.sh index 01197a6b..e113f67b 100755 --- a/bin/debugRun.sh +++ b/bin/debugRun.sh @@ -23,7 +23,7 @@ node-inspector & echo "If you are new to node-inspector, take a look at this video: http://youtu.be/AOnK3NVnxL8" cd "node" -node --debug server.js +node --debug node_modules/pluginomatic_etherpad-lite/node/server.js $* #kill node-inspector before ending kill $! diff --git a/bin/run.sh b/bin/run.sh index c409920e..74a16395 100755 --- a/bin/run.sh +++ b/bin/run.sh @@ -21,9 +21,9 @@ if [ "$(id -u)" -eq 0 ]; then fi #prepare the enviroment -bin/installDeps.sh $* || exit 1 +#bin/installDeps.sh $* || exit 1 +npm link ./src #Move to the node folder and start echo "start..." -cd "node" -node server.js $* +node node_modules/pluginomatic_etherpad-lite/node/server.js $* diff --git a/node/README.md b/src/node/README.md similarity index 100% rename from node/README.md rename to src/node/README.md diff --git a/node/db/API.js b/src/node/db/API.js similarity index 100% rename from node/db/API.js rename to src/node/db/API.js diff --git a/node/db/AuthorManager.js b/src/node/db/AuthorManager.js similarity index 100% rename from node/db/AuthorManager.js rename to src/node/db/AuthorManager.js diff --git a/node/db/DB.js b/src/node/db/DB.js similarity index 100% rename from node/db/DB.js rename to src/node/db/DB.js diff --git a/node/db/GroupManager.js b/src/node/db/GroupManager.js similarity index 100% rename from node/db/GroupManager.js rename to src/node/db/GroupManager.js diff --git a/node/db/Pad.js b/src/node/db/Pad.js similarity index 100% rename from node/db/Pad.js rename to src/node/db/Pad.js diff --git a/node/db/PadManager.js b/src/node/db/PadManager.js similarity index 100% rename from node/db/PadManager.js rename to src/node/db/PadManager.js diff --git a/node/db/ReadOnlyManager.js b/src/node/db/ReadOnlyManager.js similarity index 100% rename from node/db/ReadOnlyManager.js rename to src/node/db/ReadOnlyManager.js diff --git a/node/db/SecurityManager.js b/src/node/db/SecurityManager.js similarity index 100% rename from node/db/SecurityManager.js rename to src/node/db/SecurityManager.js diff --git a/node/db/SessionManager.js b/src/node/db/SessionManager.js similarity index 100% rename from node/db/SessionManager.js rename to src/node/db/SessionManager.js diff --git a/node/easysync_tests.js b/src/node/easysync_tests.js similarity index 100% rename from node/easysync_tests.js rename to src/node/easysync_tests.js diff --git a/node/handler/APIHandler.js b/src/node/handler/APIHandler.js similarity index 100% rename from node/handler/APIHandler.js rename to src/node/handler/APIHandler.js diff --git a/node/handler/ExportHandler.js b/src/node/handler/ExportHandler.js similarity index 100% rename from node/handler/ExportHandler.js rename to src/node/handler/ExportHandler.js diff --git a/node/handler/ImportHandler.js b/src/node/handler/ImportHandler.js similarity index 100% rename from node/handler/ImportHandler.js rename to src/node/handler/ImportHandler.js diff --git a/node/handler/PadMessageHandler.js b/src/node/handler/PadMessageHandler.js similarity index 100% rename from node/handler/PadMessageHandler.js rename to src/node/handler/PadMessageHandler.js diff --git a/node/handler/SocketIORouter.js b/src/node/handler/SocketIORouter.js similarity index 100% rename from node/handler/SocketIORouter.js rename to src/node/handler/SocketIORouter.js diff --git a/node/handler/TimesliderMessageHandler.js b/src/node/handler/TimesliderMessageHandler.js similarity index 100% rename from node/handler/TimesliderMessageHandler.js rename to src/node/handler/TimesliderMessageHandler.js diff --git a/node/hooks/express/apicalls.js b/src/node/hooks/express/apicalls.js similarity index 100% rename from node/hooks/express/apicalls.js rename to src/node/hooks/express/apicalls.js diff --git a/node/hooks/express/errorhandling.js b/src/node/hooks/express/errorhandling.js similarity index 100% rename from node/hooks/express/errorhandling.js rename to src/node/hooks/express/errorhandling.js diff --git a/node/hooks/express/importexport.js b/src/node/hooks/express/importexport.js similarity index 100% rename from node/hooks/express/importexport.js rename to src/node/hooks/express/importexport.js diff --git a/node/hooks/express/minified.js b/src/node/hooks/express/minified.js similarity index 100% rename from node/hooks/express/minified.js rename to src/node/hooks/express/minified.js diff --git a/node/hooks/express/padreadonly.js b/src/node/hooks/express/padreadonly.js similarity index 100% rename from node/hooks/express/padreadonly.js rename to src/node/hooks/express/padreadonly.js diff --git a/node/hooks/express/padurlsanitize.js b/src/node/hooks/express/padurlsanitize.js similarity index 100% rename from node/hooks/express/padurlsanitize.js rename to src/node/hooks/express/padurlsanitize.js diff --git a/node/hooks/express/socketio.js b/src/node/hooks/express/socketio.js similarity index 100% rename from node/hooks/express/socketio.js rename to src/node/hooks/express/socketio.js diff --git a/node/hooks/express/specialpages.js b/src/node/hooks/express/specialpages.js similarity index 100% rename from node/hooks/express/specialpages.js rename to src/node/hooks/express/specialpages.js diff --git a/node/hooks/express/static.js b/src/node/hooks/express/static.js similarity index 100% rename from node/hooks/express/static.js rename to src/node/hooks/express/static.js diff --git a/node/hooks/express/webaccess.js b/src/node/hooks/express/webaccess.js similarity index 100% rename from node/hooks/express/webaccess.js rename to src/node/hooks/express/webaccess.js diff --git a/node/padaccess.js b/src/node/padaccess.js similarity index 100% rename from node/padaccess.js rename to src/node/padaccess.js diff --git a/node/pluginfw/hooks.js b/src/node/pluginfw/hooks.js similarity index 100% rename from node/pluginfw/hooks.js rename to src/node/pluginfw/hooks.js diff --git a/node/pluginfw/plugins.js b/src/node/pluginfw/plugins.js similarity index 87% rename from node/pluginfw/plugins.js rename to src/node/pluginfw/plugins.js index cf26e9b0..e5646d27 100644 --- a/node/pluginfw/plugins.js +++ b/src/node/pluginfw/plugins.js @@ -41,10 +41,6 @@ exports.formatHooks = function () { exports.update = function (cb) { exports.getPackages(function (er, packages) { - packages.__builtin__ = { - "path": path.resolve(npm.dir, "../..") - }; - var parts = []; var plugins = {}; // Load plugin metadata pluginomatic.json @@ -66,8 +62,7 @@ exports.update = 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 - // ../.. and not just .. because current dir is like ETHERPAD_ROOT/node/node_modules (!!!!) - var dir = path.resolve(npm.dir, "../..") + var dir = path.resolve(npm.dir, '..'); readInstalled(dir, function (er, data) { if (er) cb(er, null); var packages = {}; @@ -107,14 +102,22 @@ exports.loadPlugin = function (packages, plugin_name, plugins, parts, cb) { fs.readFile( plugin_path, function (er, data) { - var plugin = JSON.parse(data); - plugin.package = packages[plugin_name]; - plugins[plugin_name] = plugin; - plugin.parts.forEach(function (part) { - part.plugin = plugin_name; - part.full_name = plugin_name + "/" + part.name; - parts[part.full_name] = part; - }); + if (er) { + console.error("Unable to load plugin definition file " + plugin_path); + return cb(); + } + try { + var plugin = JSON.parse(data); + plugin.package = packages[plugin_name]; + plugins[plugin_name] = plugin; + plugin.parts.forEach(function (part) { + part.plugin = plugin_name; + part.full_name = plugin_name + "/" + part.name; + parts[part.full_name] = part; + }); + } catch (ex) { + console.error("Unable to parse plugin definition file " + plugin_path + ": " + ex.toString()); + } cb(); } ); diff --git a/node/pluginfw/require.js b/src/node/pluginfw/require.js similarity index 100% rename from node/pluginfw/require.js rename to src/node/pluginfw/require.js diff --git a/node/pluginfw/tsort.js b/src/node/pluginfw/tsort.js similarity index 100% rename from node/pluginfw/tsort.js rename to src/node/pluginfw/tsort.js diff --git a/node/server.js b/src/node/server.js similarity index 100% rename from node/server.js rename to src/node/server.js diff --git a/node/utils/Abiword.js b/src/node/utils/Abiword.js similarity index 100% rename from node/utils/Abiword.js rename to src/node/utils/Abiword.js diff --git a/node/utils/Cli.js b/src/node/utils/Cli.js similarity index 100% rename from node/utils/Cli.js rename to src/node/utils/Cli.js diff --git a/node/utils/ExportDokuWiki.js b/src/node/utils/ExportDokuWiki.js similarity index 100% rename from node/utils/ExportDokuWiki.js rename to src/node/utils/ExportDokuWiki.js diff --git a/node/utils/ExportHtml.js b/src/node/utils/ExportHtml.js similarity index 100% rename from node/utils/ExportHtml.js rename to src/node/utils/ExportHtml.js diff --git a/node/utils/ImportHtml.js b/src/node/utils/ImportHtml.js similarity index 100% rename from node/utils/ImportHtml.js rename to src/node/utils/ImportHtml.js diff --git a/node/utils/Minify.js b/src/node/utils/Minify.js similarity index 96% rename from node/utils/Minify.js rename to src/node/utils/Minify.js index 859ee07a..3f983001 100644 --- a/node/utils/Minify.js +++ b/src/node/utils/Minify.js @@ -36,7 +36,7 @@ var os = require('os'); var ROOT_DIR = path.normalize(__dirname + "/../" ); var JS_DIR = ROOT_DIR + '../static/js/'; var CSS_DIR = ROOT_DIR + '../static/css/'; -var CACHE_DIR = ROOT_DIR + '../var/'; +var CACHE_DIR = path.join(settings.root, 'var'); var TAR_PATH = path.join(__dirname, 'tar.json'); var tar = JSON.parse(fs.readFileSync(TAR_PATH, 'utf8')); @@ -160,7 +160,7 @@ function _handle(req, res, jsFilename, jsFiles) { //write the results plain in a file function(callback) { - fs.writeFile(CACHE_DIR + "minified_" + jsFilename, result, "utf8", callback); + fs.writeFile(CACHE_DIR + "/minified_" + jsFilename, result, "utf8", callback); }, //write the results compressed in a file function(callback) @@ -171,7 +171,7 @@ function _handle(req, res, jsFilename, jsFiles) { if(ERR(err, callback)) return; - fs.writeFile(CACHE_DIR + "minified_" + jsFilename + ".gz", compressedResult, callback); + fs.writeFile(CACHE_DIR + "/minified_" + jsFilename + ".gz", compressedResult, callback); }); } ],callback); @@ -189,12 +189,12 @@ function _handle(req, res, jsFilename, jsFiles) { var pathStr; if(gzipSupport && os.type().indexOf("Windows") == -1) { - pathStr = path.normalize(CACHE_DIR + "minified_" + jsFilename + ".gz"); + pathStr = path.normalize(CACHE_DIR + "/minified_" + jsFilename + ".gz"); res.header('Content-Encoding', 'gzip'); } else { - pathStr = path.normalize(CACHE_DIR + "minified_" + jsFilename ); + pathStr = path.normalize(CACHE_DIR + "/minified_" + jsFilename ); } res.sendfile(pathStr, { maxAge: server.maxAge }); diff --git a/node/utils/Settings.js b/src/node/utils/Settings.js similarity index 89% rename from node/utils/Settings.js rename to src/node/utils/Settings.js index efa22694..2536daef 100644 --- a/node/utils/Settings.js +++ b/src/node/utils/Settings.js @@ -23,6 +23,10 @@ var fs = require("fs"); var os = require("os"); var path = require('path'); var argv = require('./Cli').argv; +var npm = require("npm/lib/npm.js"); + +/* Root path of the installation */ +exports.root = path.normalize(path.join(npm.dir, "..")); /** * The IP ep-lite should listen to @@ -40,7 +44,7 @@ exports.dbType = "dirty"; /** * This setting is passed with dbType to ueberDB to set up the database */ -exports.dbSettings = { "filename" : "../var/dirty.db" }; +exports.dbSettings = { "filename" : path.join(exports.root, "var/dirty.db") }; /** * The default Text of a new pad */ @@ -91,10 +95,12 @@ exports.abiwordAvailable = function() // Discover where the settings file lives var settingsFilename = argv.settings || "settings.json"; -var settingsPath = settingsFilename.charAt(0) == '/' ? '' : path.normalize(__dirname + "/../../"); +if (settingsFilename.charAt(0) != '/') { + settingsFilename = path.normalize(path.join(root, settingsFilename)); +} //read the settings sync -var settingsStr = fs.readFileSync(settingsPath + settingsFilename).toString(); +var settingsStr = fs.readFileSync(settingsFilename).toString(); //remove all comments settingsStr = settingsStr.replace(/\*([^*]|[\r\n]|(\*+([^*/]|[\r\n])))*\*+/gm,"").replace(/#.*/g,"").replace(/\/\/.*/g,""); diff --git a/node/utils/common_code.js b/src/node/utils/common_code.js similarity index 100% rename from node/utils/common_code.js rename to src/node/utils/common_code.js diff --git a/node/utils/customError.js b/src/node/utils/customError.js similarity index 100% rename from node/utils/customError.js rename to src/node/utils/customError.js diff --git a/node/utils/tar.json b/src/node/utils/tar.json similarity index 100% rename from node/utils/tar.json rename to src/node/utils/tar.json diff --git a/package.json b/src/package.json similarity index 96% rename from package.json rename to src/package.json index b8241450..a95a1ff2 100644 --- a/package.json +++ b/src/package.json @@ -1,5 +1,5 @@ { - "name" : "etherpad-lite", + "name" : "pluginomatic_etherpad-lite", "description" : "A Etherpad based on node.js", "homepage" : "https://github.com/Pita/etherpad-lite", "keywords" : ["etherpad", "realtime", "collaborative", "editor"], diff --git a/pluginomatic.json b/src/pluginomatic.json similarity index 100% rename from pluginomatic.json rename to src/pluginomatic.json diff --git a/static/css/iframe_editor.css b/src/static/css/iframe_editor.css similarity index 100% rename from static/css/iframe_editor.css rename to src/static/css/iframe_editor.css diff --git a/static/css/pad.css b/src/static/css/pad.css similarity index 100% rename from static/css/pad.css rename to src/static/css/pad.css diff --git a/static/css/timeslider.css b/src/static/css/timeslider.css similarity index 100% rename from static/css/timeslider.css rename to src/static/css/timeslider.css diff --git a/static/custom/css.template b/src/static/custom/css.template similarity index 100% rename from static/custom/css.template rename to src/static/custom/css.template diff --git a/static/custom/js.template b/src/static/custom/js.template similarity index 100% rename from static/custom/js.template rename to src/static/custom/js.template diff --git a/static/favicon.ico b/src/static/favicon.ico similarity index 100% rename from static/favicon.ico rename to src/static/favicon.ico diff --git a/static/img/backgrad.gif b/src/static/img/backgrad.gif similarity index 100% rename from static/img/backgrad.gif rename to src/static/img/backgrad.gif diff --git a/static/img/connectingbar.gif b/src/static/img/connectingbar.gif similarity index 100% rename from static/img/connectingbar.gif rename to src/static/img/connectingbar.gif diff --git a/static/img/crushed_button_depressed.png b/src/static/img/crushed_button_depressed.png similarity index 100% rename from static/img/crushed_button_depressed.png rename to src/static/img/crushed_button_depressed.png diff --git a/static/img/crushed_button_undepressed.png b/src/static/img/crushed_button_undepressed.png similarity index 100% rename from static/img/crushed_button_undepressed.png rename to src/static/img/crushed_button_undepressed.png diff --git a/static/img/crushed_current_location.png b/src/static/img/crushed_current_location.png similarity index 100% rename from static/img/crushed_current_location.png rename to src/static/img/crushed_current_location.png diff --git a/static/img/etherpad_lite_icons.png b/src/static/img/etherpad_lite_icons.png similarity index 100% rename from static/img/etherpad_lite_icons.png rename to src/static/img/etherpad_lite_icons.png diff --git a/static/img/fileicons.gif b/src/static/img/fileicons.gif similarity index 100% rename from static/img/fileicons.gif rename to src/static/img/fileicons.gif diff --git a/static/img/leftarrow.png b/src/static/img/leftarrow.png similarity index 100% rename from static/img/leftarrow.png rename to src/static/img/leftarrow.png diff --git a/static/img/loading.gif b/src/static/img/loading.gif similarity index 100% rename from static/img/loading.gif rename to src/static/img/loading.gif diff --git a/static/img/pause.png b/src/static/img/pause.png similarity index 100% rename from static/img/pause.png rename to src/static/img/pause.png diff --git a/static/img/play.png b/src/static/img/play.png similarity index 100% rename from static/img/play.png rename to src/static/img/play.png diff --git a/static/img/roundcorner_left.gif b/src/static/img/roundcorner_left.gif similarity index 100% rename from static/img/roundcorner_left.gif rename to src/static/img/roundcorner_left.gif diff --git a/static/img/roundcorner_right.gif b/src/static/img/roundcorner_right.gif similarity index 100% rename from static/img/roundcorner_right.gif rename to src/static/img/roundcorner_right.gif diff --git a/static/img/stepper_buttons.png b/src/static/img/stepper_buttons.png similarity index 100% rename from static/img/stepper_buttons.png rename to src/static/img/stepper_buttons.png diff --git a/static/img/timeslider_background.png b/src/static/img/timeslider_background.png similarity index 100% rename from static/img/timeslider_background.png rename to src/static/img/timeslider_background.png diff --git a/static/img/timeslider_left.png b/src/static/img/timeslider_left.png similarity index 100% rename from static/img/timeslider_left.png rename to src/static/img/timeslider_left.png diff --git a/static/img/timeslider_right.png b/src/static/img/timeslider_right.png similarity index 100% rename from static/img/timeslider_right.png rename to src/static/img/timeslider_right.png diff --git a/static/index.html b/src/static/index.html similarity index 100% rename from static/index.html rename to src/static/index.html diff --git a/static/js/AttributePoolFactory.js b/src/static/js/AttributePoolFactory.js similarity index 100% rename from static/js/AttributePoolFactory.js rename to src/static/js/AttributePoolFactory.js diff --git a/static/js/Changeset.js b/src/static/js/Changeset.js similarity index 100% rename from static/js/Changeset.js rename to src/static/js/Changeset.js diff --git a/static/js/ace.js b/src/static/js/ace.js similarity index 100% rename from static/js/ace.js rename to src/static/js/ace.js diff --git a/static/js/ace2_common.js b/src/static/js/ace2_common.js similarity index 100% rename from static/js/ace2_common.js rename to src/static/js/ace2_common.js diff --git a/static/js/ace2_inner.js b/src/static/js/ace2_inner.js similarity index 100% rename from static/js/ace2_inner.js rename to src/static/js/ace2_inner.js diff --git a/static/js/broadcast.js b/src/static/js/broadcast.js similarity index 100% rename from static/js/broadcast.js rename to src/static/js/broadcast.js diff --git a/static/js/broadcast_revisions.js b/src/static/js/broadcast_revisions.js similarity index 100% rename from static/js/broadcast_revisions.js rename to src/static/js/broadcast_revisions.js diff --git a/static/js/broadcast_slider.js b/src/static/js/broadcast_slider.js similarity index 100% rename from static/js/broadcast_slider.js rename to src/static/js/broadcast_slider.js diff --git a/static/js/changesettracker.js b/src/static/js/changesettracker.js similarity index 100% rename from static/js/changesettracker.js rename to src/static/js/changesettracker.js diff --git a/static/js/chat.js b/src/static/js/chat.js similarity index 100% rename from static/js/chat.js rename to src/static/js/chat.js diff --git a/static/js/collab_client.js b/src/static/js/collab_client.js similarity index 100% rename from static/js/collab_client.js rename to src/static/js/collab_client.js diff --git a/static/js/colorutils.js b/src/static/js/colorutils.js similarity index 100% rename from static/js/colorutils.js rename to src/static/js/colorutils.js diff --git a/static/js/contentcollector.js b/src/static/js/contentcollector.js similarity index 100% rename from static/js/contentcollector.js rename to src/static/js/contentcollector.js diff --git a/static/js/cssmanager.js b/src/static/js/cssmanager.js similarity index 100% rename from static/js/cssmanager.js rename to src/static/js/cssmanager.js diff --git a/static/js/domline.js b/src/static/js/domline.js similarity index 100% rename from static/js/domline.js rename to src/static/js/domline.js diff --git a/static/js/draggable.js b/src/static/js/draggable.js similarity index 100% rename from static/js/draggable.js rename to src/static/js/draggable.js diff --git a/static/js/excanvas.js b/src/static/js/excanvas.js similarity index 100% rename from static/js/excanvas.js rename to src/static/js/excanvas.js diff --git a/static/js/farbtastic.js b/src/static/js/farbtastic.js similarity index 100% rename from static/js/farbtastic.js rename to src/static/js/farbtastic.js diff --git a/src/static/js/jquery.js b/src/static/js/jquery.js new file mode 100644 index 00000000..8ccd0ea7 --- /dev/null +++ b/src/static/js/jquery.js @@ -0,0 +1,9266 @@ +/*! + * jQuery JavaScript Library v1.7.1 + * http://jquery.com/ + * + * Copyright 2011, John Resig + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * Includes Sizzle.js + * http://sizzlejs.com/ + * Copyright 2011, The Dojo Foundation + * Released under the MIT, BSD, and GPL Licenses. + * + * Date: Mon Nov 21 21:11:03 2011 -0500 + */ +(function( window, undefined ) { + +// Use the correct document accordingly with window argument (sandbox) +var document = window.document, + navigator = window.navigator, + location = window.location; +var jQuery = (function() { + +// Define a local copy of jQuery +var jQuery = function( selector, context ) { + // The jQuery object is actually just the init constructor 'enhanced' + return new jQuery.fn.init( selector, context, rootjQuery ); + }, + + // Map over jQuery in case of overwrite + _jQuery = window.jQuery, + + // Map over the $ in case of overwrite + _$ = window.$, + + // A central reference to the root jQuery(document) + rootjQuery, + + // A simple way to check for HTML strings or ID strings + // Prioritize #id over to avoid XSS via location.hash (#9521) + quickExpr = /^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/, + + // Check if a string has a non-whitespace character in it + rnotwhite = /\S/, + + // Used for trimming whitespace + trimLeft = /^\s+/, + trimRight = /\s+$/, + + // Match a standalone tag + rsingleTag = /^<(\w+)\s*\/?>(?:<\/\1>)?$/, + + // JSON RegExp + rvalidchars = /^[\],:{}\s]*$/, + rvalidescape = /\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, + rvalidtokens = /"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, + rvalidbraces = /(?:^|:|,)(?:\s*\[)+/g, + + // Useragent RegExp + rwebkit = /(webkit)[ \/]([\w.]+)/, + ropera = /(opera)(?:.*version)?[ \/]([\w.]+)/, + rmsie = /(msie) ([\w.]+)/, + rmozilla = /(mozilla)(?:.*? rv:([\w.]+))?/, + + // Matches dashed string for camelizing + rdashAlpha = /-([a-z]|[0-9])/ig, + rmsPrefix = /^-ms-/, + + // Used by jQuery.camelCase as callback to replace() + fcamelCase = function( all, letter ) { + return ( letter + "" ).toUpperCase(); + }, + + // Keep a UserAgent string for use with jQuery.browser + userAgent = navigator.userAgent, + + // For matching the engine and version of the browser + browserMatch, + + // The deferred used on DOM ready + readyList, + + // The ready event handler + DOMContentLoaded, + + // Save a reference to some core methods + toString = Object.prototype.toString, + hasOwn = Object.prototype.hasOwnProperty, + push = Array.prototype.push, + slice = Array.prototype.slice, + trim = String.prototype.trim, + indexOf = Array.prototype.indexOf, + + // [[Class]] -> type pairs + class2type = {}; + +jQuery.fn = jQuery.prototype = { + constructor: jQuery, + init: function( selector, context, rootjQuery ) { + var match, elem, ret, doc; + + // Handle $(""), $(null), or $(undefined) + if ( !selector ) { + return this; + } + + // Handle $(DOMElement) + if ( selector.nodeType ) { + this.context = this[0] = selector; + this.length = 1; + return this; + } + + // The body element only exists once, optimize finding it + if ( selector === "body" && !context && document.body ) { + this.context = document; + this[0] = document.body; + this.selector = selector; + this.length = 1; + return this; + } + + // Handle HTML strings + if ( typeof selector === "string" ) { + // Are we dealing with HTML string or an ID? + if ( selector.charAt(0) === "<" && selector.charAt( selector.length - 1 ) === ">" && selector.length >= 3 ) { + // Assume that strings that start and end with <> are HTML and skip the regex check + match = [ null, selector, null ]; + + } else { + match = quickExpr.exec( selector ); + } + + // Verify a match, and that no context was specified for #id + if ( match && (match[1] || !context) ) { + + // HANDLE: $(html) -> $(array) + if ( match[1] ) { + context = context instanceof jQuery ? context[0] : context; + doc = ( context ? context.ownerDocument || context : document ); + + // If a single string is passed in and it's a single tag + // just do a createElement and skip the rest + ret = rsingleTag.exec( selector ); + + if ( ret ) { + if ( jQuery.isPlainObject( context ) ) { + selector = [ document.createElement( ret[1] ) ]; + jQuery.fn.attr.call( selector, context, true ); + + } else { + selector = [ doc.createElement( ret[1] ) ]; + } + + } else { + ret = jQuery.buildFragment( [ match[1] ], [ doc ] ); + selector = ( ret.cacheable ? jQuery.clone(ret.fragment) : ret.fragment ).childNodes; + } + + return jQuery.merge( this, selector ); + + // HANDLE: $("#id") + } else { + elem = document.getElementById( match[2] ); + + // Check parentNode to catch when Blackberry 4.6 returns + // nodes that are no longer in the document #6963 + if ( elem && elem.parentNode ) { + // Handle the case where IE and Opera return items + // by name instead of ID + if ( elem.id !== match[2] ) { + return rootjQuery.find( selector ); + } + + // Otherwise, we inject the element directly into the jQuery object + this.length = 1; + this[0] = elem; + } + + this.context = document; + this.selector = selector; + return this; + } + + // HANDLE: $(expr, $(...)) + } else if ( !context || context.jquery ) { + return ( context || rootjQuery ).find( selector ); + + // HANDLE: $(expr, context) + // (which is just equivalent to: $(context).find(expr) + } else { + return this.constructor( context ).find( selector ); + } + + // HANDLE: $(function) + // Shortcut for document ready + } else if ( jQuery.isFunction( selector ) ) { + return rootjQuery.ready( selector ); + } + + if ( selector.selector !== undefined ) { + this.selector = selector.selector; + this.context = selector.context; + } + + return jQuery.makeArray( selector, this ); + }, + + // Start with an empty selector + selector: "", + + // The current version of jQuery being used + jquery: "1.7.1", + + // The default length of a jQuery object is 0 + length: 0, + + // The number of elements contained in the matched element set + size: function() { + return this.length; + }, + + toArray: function() { + return slice.call( this, 0 ); + }, + + // Get the Nth element in the matched element set OR + // Get the whole matched element set as a clean array + get: function( num ) { + return num == null ? + + // Return a 'clean' array + this.toArray() : + + // Return just the object + ( num < 0 ? this[ this.length + num ] : this[ num ] ); + }, + + // Take an array of elements and push it onto the stack + // (returning the new matched element set) + pushStack: function( elems, name, selector ) { + // Build a new jQuery matched element set + var ret = this.constructor(); + + if ( jQuery.isArray( elems ) ) { + push.apply( ret, elems ); + + } else { + jQuery.merge( ret, elems ); + } + + // Add the old object onto the stack (as a reference) + ret.prevObject = this; + + ret.context = this.context; + + if ( name === "find" ) { + ret.selector = this.selector + ( this.selector ? " " : "" ) + selector; + } else if ( name ) { + ret.selector = this.selector + "." + name + "(" + selector + ")"; + } + + // Return the newly-formed element set + return ret; + }, + + // Execute a callback for every element in the matched set. + // (You can seed the arguments with an array of args, but this is + // only used internally.) + each: function( callback, args ) { + return jQuery.each( this, callback, args ); + }, + + ready: function( fn ) { + // Attach the listeners + jQuery.bindReady(); + + // Add the callback + readyList.add( fn ); + + return this; + }, + + eq: function( i ) { + i = +i; + return i === -1 ? + this.slice( i ) : + this.slice( i, i + 1 ); + }, + + first: function() { + return this.eq( 0 ); + }, + + last: function() { + return this.eq( -1 ); + }, + + slice: function() { + return this.pushStack( slice.apply( this, arguments ), + "slice", slice.call(arguments).join(",") ); + }, + + map: function( callback ) { + return this.pushStack( jQuery.map(this, function( elem, i ) { + return callback.call( elem, i, elem ); + })); + }, + + end: function() { + return this.prevObject || this.constructor(null); + }, + + // For internal use only. + // Behaves like an Array's method, not like a jQuery method. + push: push, + sort: [].sort, + splice: [].splice +}; + +// Give the init function the jQuery prototype for later instantiation +jQuery.fn.init.prototype = jQuery.fn; + +jQuery.extend = jQuery.fn.extend = function() { + var options, name, src, copy, copyIsArray, clone, + target = arguments[0] || {}, + i = 1, + length = arguments.length, + deep = false; + + // Handle a deep copy situation + if ( typeof target === "boolean" ) { + deep = target; + target = arguments[1] || {}; + // skip the boolean and the target + i = 2; + } + + // Handle case when target is a string or something (possible in deep copy) + if ( typeof target !== "object" && !jQuery.isFunction(target) ) { + target = {}; + } + + // extend jQuery itself if only one argument is passed + if ( length === i ) { + target = this; + --i; + } + + for ( ; i < length; i++ ) { + // Only deal with non-null/undefined values + if ( (options = arguments[ i ]) != null ) { + // Extend the base object + for ( name in options ) { + src = target[ name ]; + copy = options[ name ]; + + // Prevent never-ending loop + if ( target === copy ) { + continue; + } + + // Recurse if we're merging plain objects or arrays + if ( deep && copy && ( jQuery.isPlainObject(copy) || (copyIsArray = jQuery.isArray(copy)) ) ) { + if ( copyIsArray ) { + copyIsArray = false; + clone = src && jQuery.isArray(src) ? src : []; + + } else { + clone = src && jQuery.isPlainObject(src) ? src : {}; + } + + // Never move original objects, clone them + target[ name ] = jQuery.extend( deep, clone, copy ); + + // Don't bring in undefined values + } else if ( copy !== undefined ) { + target[ name ] = copy; + } + } + } + } + + // Return the modified object + return target; +}; + +jQuery.extend({ + noConflict: function( deep ) { + if ( window.$ === jQuery ) { + window.$ = _$; + } + + if ( deep && window.jQuery === jQuery ) { + window.jQuery = _jQuery; + } + + return jQuery; + }, + + // Is the DOM ready to be used? Set to true once it occurs. + isReady: false, + + // A counter to track how many items to wait for before + // the ready event fires. See #6781 + readyWait: 1, + + // Hold (or release) the ready event + holdReady: function( hold ) { + if ( hold ) { + jQuery.readyWait++; + } else { + jQuery.ready( true ); + } + }, + + // Handle when the DOM is ready + ready: function( wait ) { + // Either a released hold or an DOMready/load event and not yet ready + if ( (wait === true && !--jQuery.readyWait) || (wait !== true && !jQuery.isReady) ) { + // Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443). + if ( !document.body ) { + return setTimeout( jQuery.ready, 1 ); + } + + // Remember that the DOM is ready + jQuery.isReady = true; + + // If a normal DOM Ready event fired, decrement, and wait if need be + if ( wait !== true && --jQuery.readyWait > 0 ) { + return; + } + + // If there are functions bound, to execute + readyList.fireWith( document, [ jQuery ] ); + + // Trigger any bound ready events + if ( jQuery.fn.trigger ) { + jQuery( document ).trigger( "ready" ).off( "ready" ); + } + } + }, + + bindReady: function() { + if ( readyList ) { + return; + } + + readyList = jQuery.Callbacks( "once memory" ); + + // Catch cases where $(document).ready() is called after the + // browser event has already occurred. + if ( document.readyState === "complete" ) { + // Handle it asynchronously to allow scripts the opportunity to delay ready + return setTimeout( jQuery.ready, 1 ); + } + + // Mozilla, Opera and webkit nightlies currently support this event + if ( document.addEventListener ) { + // Use the handy event callback + document.addEventListener( "DOMContentLoaded", DOMContentLoaded, false ); + + // A fallback to window.onload, that will always work + window.addEventListener( "load", jQuery.ready, false ); + + // If IE event model is used + } else if ( document.attachEvent ) { + // ensure firing before onload, + // maybe late but safe also for iframes + document.attachEvent( "onreadystatechange", DOMContentLoaded ); + + // A fallback to window.onload, that will always work + window.attachEvent( "onload", jQuery.ready ); + + // If IE and not a frame + // continually check to see if the document is ready + var toplevel = false; + + try { + toplevel = window.frameElement == null; + } catch(e) {} + + if ( document.documentElement.doScroll && toplevel ) { + doScrollCheck(); + } + } + }, + + // See test/unit/core.js for details concerning isFunction. + // Since version 1.3, DOM methods and functions like alert + // aren't supported. They return false on IE (#2968). + isFunction: function( obj ) { + return jQuery.type(obj) === "function"; + }, + + isArray: Array.isArray || function( obj ) { + return jQuery.type(obj) === "array"; + }, + + // A crude way of determining if an object is a window + isWindow: function( obj ) { + return obj && typeof obj === "object" && "setInterval" in obj; + }, + + isNumeric: function( obj ) { + return !isNaN( parseFloat(obj) ) && isFinite( obj ); + }, + + type: function( obj ) { + return obj == null ? + String( obj ) : + class2type[ toString.call(obj) ] || "object"; + }, + + isPlainObject: function( obj ) { + // Must be an Object. + // Because of IE, we also have to check the presence of the constructor property. + // Make sure that DOM nodes and window objects don't pass through, as well + if ( !obj || jQuery.type(obj) !== "object" || obj.nodeType || jQuery.isWindow( obj ) ) { + return false; + } + + try { + // Not own constructor property must be Object + if ( obj.constructor && + !hasOwn.call(obj, "constructor") && + !hasOwn.call(obj.constructor.prototype, "isPrototypeOf") ) { + return false; + } + } catch ( e ) { + // IE8,9 Will throw exceptions on certain host objects #9897 + return false; + } + + // Own properties are enumerated firstly, so to speed up, + // if last one is own, then all properties are own. + + var key; + for ( key in obj ) {} + + return key === undefined || hasOwn.call( obj, key ); + }, + + isEmptyObject: function( obj ) { + for ( var name in obj ) { + return false; + } + return true; + }, + + error: function( msg ) { + throw new Error( msg ); + }, + + parseJSON: function( data ) { + if ( typeof data !== "string" || !data ) { + return null; + } + + // Make sure leading/trailing whitespace is removed (IE can't handle it) + data = jQuery.trim( data ); + + // Attempt to parse using the native JSON parser first + if ( window.JSON && window.JSON.parse ) { + return window.JSON.parse( data ); + } + + // Make sure the incoming data is actual JSON + // Logic borrowed from http://json.org/json2.js + if ( rvalidchars.test( data.replace( rvalidescape, "@" ) + .replace( rvalidtokens, "]" ) + .replace( rvalidbraces, "")) ) { + + return ( new Function( "return " + data ) )(); + + } + jQuery.error( "Invalid JSON: " + data ); + }, + + // Cross-browser xml parsing + parseXML: function( data ) { + var xml, tmp; + try { + if ( window.DOMParser ) { // Standard + tmp = new DOMParser(); + xml = tmp.parseFromString( data , "text/xml" ); + } else { // IE + xml = new ActiveXObject( "Microsoft.XMLDOM" ); + xml.async = "false"; + xml.loadXML( data ); + } + } catch( e ) { + xml = undefined; + } + if ( !xml || !xml.documentElement || xml.getElementsByTagName( "parsererror" ).length ) { + jQuery.error( "Invalid XML: " + data ); + } + return xml; + }, + + noop: function() {}, + + // Evaluates a script in a global context + // Workarounds based on findings by Jim Driscoll + // http://weblogs.java.net/blog/driscoll/archive/2009/09/08/eval-javascript-global-context + globalEval: function( data ) { + if ( data && rnotwhite.test( data ) ) { + // We use execScript on Internet Explorer + // We use an anonymous function so that context is window + // rather than jQuery in Firefox + ( window.execScript || function( data ) { + window[ "eval" ].call( window, data ); + } )( data ); + } + }, + + // Convert dashed to camelCase; used by the css and data modules + // Microsoft forgot to hump their vendor prefix (#9572) + camelCase: function( string ) { + return string.replace( rmsPrefix, "ms-" ).replace( rdashAlpha, fcamelCase ); + }, + + nodeName: function( elem, name ) { + return elem.nodeName && elem.nodeName.toUpperCase() === name.toUpperCase(); + }, + + // args is for internal usage only + each: function( object, callback, args ) { + var name, i = 0, + length = object.length, + isObj = length === undefined || jQuery.isFunction( object ); + + if ( args ) { + if ( isObj ) { + for ( name in object ) { + if ( callback.apply( object[ name ], args ) === false ) { + break; + } + } + } else { + for ( ; i < length; ) { + if ( callback.apply( object[ i++ ], args ) === false ) { + break; + } + } + } + + // A special, fast, case for the most common use of each + } else { + if ( isObj ) { + for ( name in object ) { + if ( callback.call( object[ name ], name, object[ name ] ) === false ) { + break; + } + } + } else { + for ( ; i < length; ) { + if ( callback.call( object[ i ], i, object[ i++ ] ) === false ) { + break; + } + } + } + } + + return object; + }, + + // Use native String.trim function wherever possible + trim: trim ? + function( text ) { + return text == null ? + "" : + trim.call( text ); + } : + + // Otherwise use our own trimming functionality + function( text ) { + return text == null ? + "" : + text.toString().replace( trimLeft, "" ).replace( trimRight, "" ); + }, + + // results is for internal usage only + makeArray: function( array, results ) { + var ret = results || []; + + if ( array != null ) { + // The window, strings (and functions) also have 'length' + // Tweaked logic slightly to handle Blackberry 4.7 RegExp issues #6930 + var type = jQuery.type( array ); + + if ( array.length == null || type === "string" || type === "function" || type === "regexp" || jQuery.isWindow( array ) ) { + push.call( ret, array ); + } else { + jQuery.merge( ret, array ); + } + } + + return ret; + }, + + inArray: function( elem, array, i ) { + var len; + + if ( array ) { + if ( indexOf ) { + return indexOf.call( array, elem, i ); + } + + len = array.length; + i = i ? i < 0 ? Math.max( 0, len + i ) : i : 0; + + for ( ; i < len; i++ ) { + // Skip accessing in sparse arrays + if ( i in array && array[ i ] === elem ) { + return i; + } + } + } + + return -1; + }, + + merge: function( first, second ) { + var i = first.length, + j = 0; + + if ( typeof second.length === "number" ) { + for ( var l = second.length; j < l; j++ ) { + first[ i++ ] = second[ j ]; + } + + } else { + while ( second[j] !== undefined ) { + first[ i++ ] = second[ j++ ]; + } + } + + first.length = i; + + return first; + }, + + grep: function( elems, callback, inv ) { + var ret = [], retVal; + inv = !!inv; + + // Go through the array, only saving the items + // that pass the validator function + for ( var i = 0, length = elems.length; i < length; i++ ) { + retVal = !!callback( elems[ i ], i ); + if ( inv !== retVal ) { + ret.push( elems[ i ] ); + } + } + + return ret; + }, + + // arg is for internal usage only + map: function( elems, callback, arg ) { + var value, key, ret = [], + i = 0, + length = elems.length, + // jquery objects are treated as arrays + isArray = elems instanceof jQuery || length !== undefined && typeof length === "number" && ( ( length > 0 && elems[ 0 ] && elems[ length -1 ] ) || length === 0 || jQuery.isArray( elems ) ) ; + + // Go through the array, translating each of the items to their + if ( isArray ) { + for ( ; i < length; i++ ) { + value = callback( elems[ i ], i, arg ); + + if ( value != null ) { + ret[ ret.length ] = value; + } + } + + // Go through every key on the object, + } else { + for ( key in elems ) { + value = callback( elems[ key ], key, arg ); + + if ( value != null ) { + ret[ ret.length ] = value; + } + } + } + + // Flatten any nested arrays + return ret.concat.apply( [], ret ); + }, + + // A global GUID counter for objects + guid: 1, + + // Bind a function to a context, optionally partially applying any + // arguments. + proxy: function( fn, context ) { + if ( typeof context === "string" ) { + var tmp = fn[ context ]; + context = fn; + fn = tmp; + } + + // Quick check to determine if target is callable, in the spec + // this throws a TypeError, but we will just return undefined. + if ( !jQuery.isFunction( fn ) ) { + return undefined; + } + + // Simulated bind + var args = slice.call( arguments, 2 ), + proxy = function() { + return fn.apply( context, args.concat( slice.call( arguments ) ) ); + }; + + // Set the guid of unique handler to the same of original handler, so it can be removed + proxy.guid = fn.guid = fn.guid || proxy.guid || jQuery.guid++; + + return proxy; + }, + + // Mutifunctional method to get and set values to a collection + // The value/s can optionally be executed if it's a function + access: function( elems, key, value, exec, fn, pass ) { + var length = elems.length; + + // Setting many attributes + if ( typeof key === "object" ) { + for ( var k in key ) { + jQuery.access( elems, k, key[k], exec, fn, value ); + } + return elems; + } + + // Setting one attribute + if ( value !== undefined ) { + // Optionally, function values get executed if exec is true + exec = !pass && exec && jQuery.isFunction(value); + + for ( var i = 0; i < length; i++ ) { + fn( elems[i], key, exec ? value.call( elems[i], i, fn( elems[i], key ) ) : value, pass ); + } + + return elems; + } + + // Getting an attribute + return length ? fn( elems[0], key ) : undefined; + }, + + now: function() { + return ( new Date() ).getTime(); + }, + + // Use of jQuery.browser is frowned upon. + // More details: http://docs.jquery.com/Utilities/jQuery.browser + uaMatch: function( ua ) { + ua = ua.toLowerCase(); + + var match = rwebkit.exec( ua ) || + ropera.exec( ua ) || + rmsie.exec( ua ) || + ua.indexOf("compatible") < 0 && rmozilla.exec( ua ) || + []; + + return { browser: match[1] || "", version: match[2] || "0" }; + }, + + sub: function() { + function jQuerySub( selector, context ) { + return new jQuerySub.fn.init( selector, context ); + } + jQuery.extend( true, jQuerySub, this ); + jQuerySub.superclass = this; + jQuerySub.fn = jQuerySub.prototype = this(); + jQuerySub.fn.constructor = jQuerySub; + jQuerySub.sub = this.sub; + jQuerySub.fn.init = function init( selector, context ) { + if ( context && context instanceof jQuery && !(context instanceof jQuerySub) ) { + context = jQuerySub( context ); + } + + return jQuery.fn.init.call( this, selector, context, rootjQuerySub ); + }; + jQuerySub.fn.init.prototype = jQuerySub.fn; + var rootjQuerySub = jQuerySub(document); + return jQuerySub; + }, + + browser: {} +}); + +// Populate the class2type map +jQuery.each("Boolean Number String Function Array Date RegExp Object".split(" "), function(i, name) { + class2type[ "[object " + name + "]" ] = name.toLowerCase(); +}); + +browserMatch = jQuery.uaMatch( userAgent ); +if ( browserMatch.browser ) { + jQuery.browser[ browserMatch.browser ] = true; + jQuery.browser.version = browserMatch.version; +} + +// Deprecated, use jQuery.browser.webkit instead +if ( jQuery.browser.webkit ) { + jQuery.browser.safari = true; +} + +// IE doesn't match non-breaking spaces with \s +if ( rnotwhite.test( "\xA0" ) ) { + trimLeft = /^[\s\xA0]+/; + trimRight = /[\s\xA0]+$/; +} + +// All jQuery objects should point back to these +rootjQuery = jQuery(document); + +// Cleanup functions for the document ready method +if ( document.addEventListener ) { + DOMContentLoaded = function() { + document.removeEventListener( "DOMContentLoaded", DOMContentLoaded, false ); + jQuery.ready(); + }; + +} else if ( document.attachEvent ) { + DOMContentLoaded = function() { + // Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443). + if ( document.readyState === "complete" ) { + document.detachEvent( "onreadystatechange", DOMContentLoaded ); + jQuery.ready(); + } + }; +} + +// The DOM ready check for Internet Explorer +function doScrollCheck() { + if ( jQuery.isReady ) { + return; + } + + try { + // If IE is used, use the trick by Diego Perini + // http://javascript.nwbox.com/IEContentLoaded/ + document.documentElement.doScroll("left"); + } catch(e) { + setTimeout( doScrollCheck, 1 ); + return; + } + + // and execute any waiting functions + jQuery.ready(); +} + +return jQuery; + +})(); + + +// String to Object flags format cache +var flagsCache = {}; + +// Convert String-formatted flags into Object-formatted ones and store in cache +function createFlags( flags ) { + var object = flagsCache[ flags ] = {}, + i, length; + flags = flags.split( /\s+/ ); + for ( i = 0, length = flags.length; i < length; i++ ) { + object[ flags[i] ] = true; + } + return object; +} + +/* + * Create a callback list using the following parameters: + * + * flags: an optional list of space-separated flags that will change how + * the callback list behaves + * + * By default a callback list will act like an event callback list and can be + * "fired" multiple times. + * + * Possible flags: + * + * once: will ensure the callback list can only be fired once (like a Deferred) + * + * memory: will keep track of previous values and will call any callback added + * after the list has been fired right away with the latest "memorized" + * values (like a Deferred) + * + * unique: will ensure a callback can only be added once (no duplicate in the list) + * + * stopOnFalse: interrupt callings when a callback returns false + * + */ +jQuery.Callbacks = function( flags ) { + + // Convert flags from String-formatted to Object-formatted + // (we check in cache first) + flags = flags ? ( flagsCache[ flags ] || createFlags( flags ) ) : {}; + + var // Actual callback list + list = [], + // Stack of fire calls for repeatable lists + stack = [], + // Last fire value (for non-forgettable lists) + memory, + // Flag to know if list is currently firing + firing, + // First callback to fire (used internally by add and fireWith) + firingStart, + // End of the loop when firing + firingLength, + // Index of currently firing callback (modified by remove if needed) + firingIndex, + // Add one or several callbacks to the list + add = function( args ) { + var i, + length, + elem, + type, + actual; + for ( i = 0, length = args.length; i < length; i++ ) { + elem = args[ i ]; + type = jQuery.type( elem ); + if ( type === "array" ) { + // Inspect recursively + add( elem ); + } else if ( type === "function" ) { + // Add if not in unique mode and callback is not in + if ( !flags.unique || !self.has( elem ) ) { + list.push( elem ); + } + } + } + }, + // Fire callbacks + fire = function( context, args ) { + args = args || []; + memory = !flags.memory || [ context, args ]; + firing = true; + firingIndex = firingStart || 0; + firingStart = 0; + firingLength = list.length; + for ( ; list && firingIndex < firingLength; firingIndex++ ) { + if ( list[ firingIndex ].apply( context, args ) === false && flags.stopOnFalse ) { + memory = true; // Mark as halted + break; + } + } + firing = false; + if ( list ) { + if ( !flags.once ) { + if ( stack && stack.length ) { + memory = stack.shift(); + self.fireWith( memory[ 0 ], memory[ 1 ] ); + } + } else if ( memory === true ) { + self.disable(); + } else { + list = []; + } + } + }, + // Actual Callbacks object + self = { + // Add a callback or a collection of callbacks to the list + add: function() { + if ( list ) { + var length = list.length; + add( arguments ); + // Do we need to add the callbacks to the + // current firing batch? + if ( firing ) { + firingLength = list.length; + // With memory, if we're not firing then + // we should call right away, unless previous + // firing was halted (stopOnFalse) + } else if ( memory && memory !== true ) { + firingStart = length; + fire( memory[ 0 ], memory[ 1 ] ); + } + } + return this; + }, + // Remove a callback from the list + remove: function() { + if ( list ) { + var args = arguments, + argIndex = 0, + argLength = args.length; + for ( ; argIndex < argLength ; argIndex++ ) { + for ( var i = 0; i < list.length; i++ ) { + if ( args[ argIndex ] === list[ i ] ) { + // Handle firingIndex and firingLength + if ( firing ) { + if ( i <= firingLength ) { + firingLength--; + if ( i <= firingIndex ) { + firingIndex--; + } + } + } + // Remove the element + list.splice( i--, 1 ); + // If we have some unicity property then + // we only need to do this once + if ( flags.unique ) { + break; + } + } + } + } + } + return this; + }, + // Control if a given callback is in the list + has: function( fn ) { + if ( list ) { + var i = 0, + length = list.length; + for ( ; i < length; i++ ) { + if ( fn === list[ i ] ) { + return true; + } + } + } + return false; + }, + // Remove all callbacks from the list + empty: function() { + list = []; + return this; + }, + // Have the list do nothing anymore + disable: function() { + list = stack = memory = undefined; + return this; + }, + // Is it disabled? + disabled: function() { + return !list; + }, + // Lock the list in its current state + lock: function() { + stack = undefined; + if ( !memory || memory === true ) { + self.disable(); + } + return this; + }, + // Is it locked? + locked: function() { + return !stack; + }, + // Call all callbacks with the given context and arguments + fireWith: function( context, args ) { + if ( stack ) { + if ( firing ) { + if ( !flags.once ) { + stack.push( [ context, args ] ); + } + } else if ( !( flags.once && memory ) ) { + fire( context, args ); + } + } + return this; + }, + // Call all the callbacks with the given arguments + fire: function() { + self.fireWith( this, arguments ); + return this; + }, + // To know if the callbacks have already been called at least once + fired: function() { + return !!memory; + } + }; + + return self; +}; + + + + +var // Static reference to slice + sliceDeferred = [].slice; + +jQuery.extend({ + + Deferred: function( func ) { + var doneList = jQuery.Callbacks( "once memory" ), + failList = jQuery.Callbacks( "once memory" ), + progressList = jQuery.Callbacks( "memory" ), + state = "pending", + lists = { + resolve: doneList, + reject: failList, + notify: progressList + }, + promise = { + done: doneList.add, + fail: failList.add, + progress: progressList.add, + + state: function() { + return state; + }, + + // Deprecated + isResolved: doneList.fired, + isRejected: failList.fired, + + then: function( doneCallbacks, failCallbacks, progressCallbacks ) { + deferred.done( doneCallbacks ).fail( failCallbacks ).progress( progressCallbacks ); + return this; + }, + always: function() { + deferred.done.apply( deferred, arguments ).fail.apply( deferred, arguments ); + return this; + }, + pipe: function( fnDone, fnFail, fnProgress ) { + return jQuery.Deferred(function( newDefer ) { + jQuery.each( { + done: [ fnDone, "resolve" ], + fail: [ fnFail, "reject" ], + progress: [ fnProgress, "notify" ] + }, function( handler, data ) { + var fn = data[ 0 ], + action = data[ 1 ], + returned; + if ( jQuery.isFunction( fn ) ) { + deferred[ handler ](function() { + returned = fn.apply( this, arguments ); + if ( returned && jQuery.isFunction( returned.promise ) ) { + returned.promise().then( newDefer.resolve, newDefer.reject, newDefer.notify ); + } else { + newDefer[ action + "With" ]( this === deferred ? newDefer : this, [ returned ] ); + } + }); + } else { + deferred[ handler ]( newDefer[ action ] ); + } + }); + }).promise(); + }, + // Get a promise for this deferred + // If obj is provided, the promise aspect is added to the object + promise: function( obj ) { + if ( obj == null ) { + obj = promise; + } else { + for ( var key in promise ) { + obj[ key ] = promise[ key ]; + } + } + return obj; + } + }, + deferred = promise.promise({}), + key; + + for ( key in lists ) { + deferred[ key ] = lists[ key ].fire; + deferred[ key + "With" ] = lists[ key ].fireWith; + } + + // Handle state + deferred.done( function() { + state = "resolved"; + }, failList.disable, progressList.lock ).fail( function() { + state = "rejected"; + }, doneList.disable, progressList.lock ); + + // Call given func if any + if ( func ) { + func.call( deferred, deferred ); + } + + // All done! + return deferred; + }, + + // Deferred helper + when: function( firstParam ) { + var args = sliceDeferred.call( arguments, 0 ), + i = 0, + length = args.length, + pValues = new Array( length ), + count = length, + pCount = length, + deferred = length <= 1 && firstParam && jQuery.isFunction( firstParam.promise ) ? + firstParam : + jQuery.Deferred(), + promise = deferred.promise(); + function resolveFunc( i ) { + return function( value ) { + args[ i ] = arguments.length > 1 ? sliceDeferred.call( arguments, 0 ) : value; + if ( !( --count ) ) { + deferred.resolveWith( deferred, args ); + } + }; + } + function progressFunc( i ) { + return function( value ) { + pValues[ i ] = arguments.length > 1 ? sliceDeferred.call( arguments, 0 ) : value; + deferred.notifyWith( promise, pValues ); + }; + } + if ( length > 1 ) { + for ( ; i < length; i++ ) { + if ( args[ i ] && args[ i ].promise && jQuery.isFunction( args[ i ].promise ) ) { + args[ i ].promise().then( resolveFunc(i), deferred.reject, progressFunc(i) ); + } else { + --count; + } + } + if ( !count ) { + deferred.resolveWith( deferred, args ); + } + } else if ( deferred !== firstParam ) { + deferred.resolveWith( deferred, length ? [ firstParam ] : [] ); + } + return promise; + } +}); + + + + +jQuery.support = (function() { + + var support, + all, + a, + select, + opt, + input, + marginDiv, + fragment, + tds, + events, + eventName, + i, + isSupported, + div = document.createElement( "div" ), + documentElement = document.documentElement; + + // Preliminary tests + div.setAttribute("className", "t"); + div.innerHTML = "
a"; + + all = div.getElementsByTagName( "*" ); + a = div.getElementsByTagName( "a" )[ 0 ]; + + // Can't get basic test support + if ( !all || !all.length || !a ) { + return {}; + } + + // First batch of supports tests + select = document.createElement( "select" ); + opt = select.appendChild( document.createElement("option") ); + input = div.getElementsByTagName( "input" )[ 0 ]; + + support = { + // IE strips leading whitespace when .innerHTML is used + leadingWhitespace: ( div.firstChild.nodeType === 3 ), + + // Make sure that tbody elements aren't automatically inserted + // IE will insert them into empty tables + tbody: !div.getElementsByTagName("tbody").length, + + // Make sure that link elements get serialized correctly by innerHTML + // This requires a wrapper element in IE + htmlSerialize: !!div.getElementsByTagName("link").length, + + // Get the style information from getAttribute + // (IE uses .cssText instead) + style: /top/.test( a.getAttribute("style") ), + + // Make sure that URLs aren't manipulated + // (IE normalizes it by default) + hrefNormalized: ( a.getAttribute("href") === "/a" ), + + // Make sure that element opacity exists + // (IE uses filter instead) + // Use a regex to work around a WebKit issue. See #5145 + opacity: /^0.55/.test( a.style.opacity ), + + // Verify style float existence + // (IE uses styleFloat instead of cssFloat) + cssFloat: !!a.style.cssFloat, + + // Make sure that if no value is specified for a checkbox + // that it defaults to "on". + // (WebKit defaults to "" instead) + checkOn: ( input.value === "on" ), + + // Make sure that a selected-by-default option has a working selected property. + // (WebKit defaults to false instead of true, IE too, if it's in an optgroup) + optSelected: opt.selected, + + // Test setAttribute on camelCase class. If it works, we need attrFixes when doing get/setAttribute (ie6/7) + getSetAttribute: div.className !== "t", + + // Tests for enctype support on a form(#6743) + enctype: !!document.createElement("form").enctype, + + // Makes sure cloning an html5 element does not cause problems + // Where outerHTML is undefined, this still works + html5Clone: document.createElement("nav").cloneNode( true ).outerHTML !== "<:nav>", + + // Will be defined later + submitBubbles: true, + changeBubbles: true, + focusinBubbles: false, + deleteExpando: true, + noCloneEvent: true, + inlineBlockNeedsLayout: false, + shrinkWrapBlocks: false, + reliableMarginRight: true + }; + + // Make sure checked status is properly cloned + input.checked = true; + support.noCloneChecked = input.cloneNode( true ).checked; + + // Make sure that the options inside disabled selects aren't marked as disabled + // (WebKit marks them as disabled) + select.disabled = true; + support.optDisabled = !opt.disabled; + + // Test to see if it's possible to delete an expando from an element + // Fails in Internet Explorer + try { + delete div.test; + } catch( e ) { + support.deleteExpando = false; + } + + if ( !div.addEventListener && div.attachEvent && div.fireEvent ) { + div.attachEvent( "onclick", function() { + // Cloning a node shouldn't copy over any + // bound event handlers (IE does this) + support.noCloneEvent = false; + }); + div.cloneNode( true ).fireEvent( "onclick" ); + } + + // Check if a radio maintains its value + // after being appended to the DOM + input = document.createElement("input"); + input.value = "t"; + input.setAttribute("type", "radio"); + support.radioValue = input.value === "t"; + + input.setAttribute("checked", "checked"); + div.appendChild( input ); + fragment = document.createDocumentFragment(); + fragment.appendChild( div.lastChild ); + + // WebKit doesn't clone checked state correctly in fragments + support.checkClone = fragment.cloneNode( true ).cloneNode( true ).lastChild.checked; + + // Check if a disconnected checkbox will retain its checked + // value of true after appended to the DOM (IE6/7) + support.appendChecked = input.checked; + + fragment.removeChild( input ); + fragment.appendChild( div ); + + div.innerHTML = ""; + + // Check if div with explicit width and no margin-right incorrectly + // gets computed margin-right based on width of container. For more + // info see bug #3333 + // Fails in WebKit before Feb 2011 nightlies + // WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right + if ( window.getComputedStyle ) { + marginDiv = document.createElement( "div" ); + marginDiv.style.width = "0"; + marginDiv.style.marginRight = "0"; + div.style.width = "2px"; + div.appendChild( marginDiv ); + support.reliableMarginRight = + ( parseInt( ( window.getComputedStyle( marginDiv, null ) || { marginRight: 0 } ).marginRight, 10 ) || 0 ) === 0; + } + + // Technique from Juriy Zaytsev + // http://perfectionkills.com/detecting-event-support-without-browser-sniffing/ + // We only care about the case where non-standard event systems + // are used, namely in IE. Short-circuiting here helps us to + // avoid an eval call (in setAttribute) which can cause CSP + // to go haywire. See: https://developer.mozilla.org/en/Security/CSP + if ( div.attachEvent ) { + for( i in { + submit: 1, + change: 1, + focusin: 1 + }) { + eventName = "on" + i; + isSupported = ( eventName in div ); + if ( !isSupported ) { + div.setAttribute( eventName, "return;" ); + isSupported = ( typeof div[ eventName ] === "function" ); + } + support[ i + "Bubbles" ] = isSupported; + } + } + + fragment.removeChild( div ); + + // Null elements to avoid leaks in IE + fragment = select = opt = marginDiv = div = input = null; + + // Run tests that need a body at doc ready + jQuery(function() { + var container, outer, inner, table, td, offsetSupport, + conMarginTop, ptlm, vb, style, html, + body = document.getElementsByTagName("body")[0]; + + if ( !body ) { + // Return for frameset docs that don't have a body + return; + } + + conMarginTop = 1; + ptlm = "position:absolute;top:0;left:0;width:1px;height:1px;margin:0;"; + vb = "visibility:hidden;border:0;"; + style = "style='" + ptlm + "border:5px solid #000;padding:0;'"; + html = "
" + + "" + + "
"; + + container = document.createElement("div"); + container.style.cssText = vb + "width:0;height:0;position:static;top:0;margin-top:" + conMarginTop + "px"; + body.insertBefore( container, body.firstChild ); + + // Construct the test element + div = document.createElement("div"); + container.appendChild( div ); + + // Check if table cells still have offsetWidth/Height when they are set + // to display:none and there are still other visible table cells in a + // table row; if so, offsetWidth/Height are not reliable for use when + // determining if an element has been hidden directly using + // display:none (it is still safe to use offsets if a parent element is + // hidden; don safety goggles and see bug #4512 for more information). + // (only IE 8 fails this test) + div.innerHTML = "
t
"; + tds = div.getElementsByTagName( "td" ); + isSupported = ( tds[ 0 ].offsetHeight === 0 ); + + tds[ 0 ].style.display = ""; + tds[ 1 ].style.display = "none"; + + // Check if empty table cells still have offsetWidth/Height + // (IE <= 8 fail this test) + support.reliableHiddenOffsets = isSupported && ( tds[ 0 ].offsetHeight === 0 ); + + // Figure out if the W3C box model works as expected + div.innerHTML = ""; + div.style.width = div.style.paddingLeft = "1px"; + jQuery.boxModel = support.boxModel = div.offsetWidth === 2; + + if ( typeof div.style.zoom !== "undefined" ) { + // Check if natively block-level elements act like inline-block + // elements when setting their display to 'inline' and giving + // them layout + // (IE < 8 does this) + div.style.display = "inline"; + div.style.zoom = 1; + support.inlineBlockNeedsLayout = ( div.offsetWidth === 2 ); + + // Check if elements with layout shrink-wrap their children + // (IE 6 does this) + div.style.display = ""; + div.innerHTML = "
"; + support.shrinkWrapBlocks = ( div.offsetWidth !== 2 ); + } + + div.style.cssText = ptlm + vb; + div.innerHTML = html; + + outer = div.firstChild; + inner = outer.firstChild; + td = outer.nextSibling.firstChild.firstChild; + + offsetSupport = { + doesNotAddBorder: ( inner.offsetTop !== 5 ), + doesAddBorderForTableAndCells: ( td.offsetTop === 5 ) + }; + + inner.style.position = "fixed"; + inner.style.top = "20px"; + + // safari subtracts parent border width here which is 5px + offsetSupport.fixedPosition = ( inner.offsetTop === 20 || inner.offsetTop === 15 ); + inner.style.position = inner.style.top = ""; + + outer.style.overflow = "hidden"; + outer.style.position = "relative"; + + offsetSupport.subtractsBorderForOverflowNotVisible = ( inner.offsetTop === -5 ); + offsetSupport.doesNotIncludeMarginInBodyOffset = ( body.offsetTop !== conMarginTop ); + + body.removeChild( container ); + div = container = null; + + jQuery.extend( support, offsetSupport ); + }); + + return support; +})(); + + + + +var rbrace = /^(?:\{.*\}|\[.*\])$/, + rmultiDash = /([A-Z])/g; + +jQuery.extend({ + cache: {}, + + // Please use with caution + uuid: 0, + + // Unique for each copy of jQuery on the page + // Non-digits removed to match rinlinejQuery + expando: "jQuery" + ( jQuery.fn.jquery + Math.random() ).replace( /\D/g, "" ), + + // The following elements throw uncatchable exceptions if you + // attempt to add expando properties to them. + noData: { + "embed": true, + // Ban all objects except for Flash (which handle expandos) + "object": "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000", + "applet": true + }, + + hasData: function( elem ) { + elem = elem.nodeType ? jQuery.cache[ elem[jQuery.expando] ] : elem[ jQuery.expando ]; + return !!elem && !isEmptyDataObject( elem ); + }, + + data: function( elem, name, data, pvt /* Internal Use Only */ ) { + if ( !jQuery.acceptData( elem ) ) { + return; + } + + var privateCache, thisCache, ret, + internalKey = jQuery.expando, + getByName = typeof name === "string", + + // We have to handle DOM nodes and JS objects differently because IE6-7 + // can't GC object references properly across the DOM-JS boundary + isNode = elem.nodeType, + + // Only DOM nodes need the global jQuery cache; JS object data is + // attached directly to the object so GC can occur automatically + cache = isNode ? jQuery.cache : elem, + + // Only defining an ID for JS objects if its cache already exists allows + // the code to shortcut on the same path as a DOM node with no cache + id = isNode ? elem[ internalKey ] : elem[ internalKey ] && internalKey, + isEvents = name === "events"; + + // Avoid doing any more work than we need to when trying to get data on an + // object that has no data at all + if ( (!id || !cache[id] || (!isEvents && !pvt && !cache[id].data)) && getByName && data === undefined ) { + return; + } + + if ( !id ) { + // Only DOM nodes need a new unique ID for each element since their data + // ends up in the global cache + if ( isNode ) { + elem[ internalKey ] = id = ++jQuery.uuid; + } else { + id = internalKey; + } + } + + if ( !cache[ id ] ) { + cache[ id ] = {}; + + // Avoids exposing jQuery metadata on plain JS objects when the object + // is serialized using JSON.stringify + if ( !isNode ) { + cache[ id ].toJSON = jQuery.noop; + } + } + + // An object can be passed to jQuery.data instead of a key/value pair; this gets + // shallow copied over onto the existing cache + if ( typeof name === "object" || typeof name === "function" ) { + if ( pvt ) { + cache[ id ] = jQuery.extend( cache[ id ], name ); + } else { + cache[ id ].data = jQuery.extend( cache[ id ].data, name ); + } + } + + privateCache = thisCache = cache[ id ]; + + // jQuery data() is stored in a separate object inside the object's internal data + // cache in order to avoid key collisions between internal data and user-defined + // data. + if ( !pvt ) { + if ( !thisCache.data ) { + thisCache.data = {}; + } + + thisCache = thisCache.data; + } + + if ( data !== undefined ) { + thisCache[ jQuery.camelCase( name ) ] = data; + } + + // Users should not attempt to inspect the internal events object using jQuery.data, + // it is undocumented and subject to change. But does anyone listen? No. + if ( isEvents && !thisCache[ name ] ) { + return privateCache.events; + } + + // Check for both converted-to-camel and non-converted data property names + // If a data property was specified + if ( getByName ) { + + // First Try to find as-is property data + ret = thisCache[ name ]; + + // Test for null|undefined property data + if ( ret == null ) { + + // Try to find the camelCased property + ret = thisCache[ jQuery.camelCase( name ) ]; + } + } else { + ret = thisCache; + } + + return ret; + }, + + removeData: function( elem, name, pvt /* Internal Use Only */ ) { + if ( !jQuery.acceptData( elem ) ) { + return; + } + + var thisCache, i, l, + + // Reference to internal data cache key + internalKey = jQuery.expando, + + isNode = elem.nodeType, + + // See jQuery.data for more information + cache = isNode ? jQuery.cache : elem, + + // See jQuery.data for more information + id = isNode ? elem[ internalKey ] : internalKey; + + // If there is already no cache entry for this object, there is no + // purpose in continuing + if ( !cache[ id ] ) { + return; + } + + if ( name ) { + + thisCache = pvt ? cache[ id ] : cache[ id ].data; + + if ( thisCache ) { + + // Support array or space separated string names for data keys + if ( !jQuery.isArray( name ) ) { + + // try the string as a key before any manipulation + if ( name in thisCache ) { + name = [ name ]; + } else { + + // split the camel cased version by spaces unless a key with the spaces exists + name = jQuery.camelCase( name ); + if ( name in thisCache ) { + name = [ name ]; + } else { + name = name.split( " " ); + } + } + } + + for ( i = 0, l = name.length; i < l; i++ ) { + delete thisCache[ name[i] ]; + } + + // If there is no data left in the cache, we want to continue + // and let the cache object itself get destroyed + if ( !( pvt ? isEmptyDataObject : jQuery.isEmptyObject )( thisCache ) ) { + return; + } + } + } + + // See jQuery.data for more information + if ( !pvt ) { + delete cache[ id ].data; + + // Don't destroy the parent cache unless the internal data object + // had been the only thing left in it + if ( !isEmptyDataObject(cache[ id ]) ) { + return; + } + } + + // Browsers that fail expando deletion also refuse to delete expandos on + // the window, but it will allow it on all other JS objects; other browsers + // don't care + // Ensure that `cache` is not a window object #10080 + if ( jQuery.support.deleteExpando || !cache.setInterval ) { + delete cache[ id ]; + } else { + cache[ id ] = null; + } + + // We destroyed the cache and need to eliminate the expando on the node to avoid + // false lookups in the cache for entries that no longer exist + if ( isNode ) { + // IE does not allow us to delete expando properties from nodes, + // nor does it have a removeAttribute function on Document nodes; + // we must handle all of these cases + if ( jQuery.support.deleteExpando ) { + delete elem[ internalKey ]; + } else if ( elem.removeAttribute ) { + elem.removeAttribute( internalKey ); + } else { + elem[ internalKey ] = null; + } + } + }, + + // For internal use only. + _data: function( elem, name, data ) { + return jQuery.data( elem, name, data, true ); + }, + + // A method for determining if a DOM node can handle the data expando + acceptData: function( elem ) { + if ( elem.nodeName ) { + var match = jQuery.noData[ elem.nodeName.toLowerCase() ]; + + if ( match ) { + return !(match === true || elem.getAttribute("classid") !== match); + } + } + + return true; + } +}); + +jQuery.fn.extend({ + data: function( key, value ) { + var parts, attr, name, + data = null; + + if ( typeof key === "undefined" ) { + if ( this.length ) { + data = jQuery.data( this[0] ); + + if ( this[0].nodeType === 1 && !jQuery._data( this[0], "parsedAttrs" ) ) { + attr = this[0].attributes; + for ( var i = 0, l = attr.length; i < l; i++ ) { + name = attr[i].name; + + if ( name.indexOf( "data-" ) === 0 ) { + name = jQuery.camelCase( name.substring(5) ); + + dataAttr( this[0], name, data[ name ] ); + } + } + jQuery._data( this[0], "parsedAttrs", true ); + } + } + + return data; + + } else if ( typeof key === "object" ) { + return this.each(function() { + jQuery.data( this, key ); + }); + } + + parts = key.split("."); + parts[1] = parts[1] ? "." + parts[1] : ""; + + if ( value === undefined ) { + data = this.triggerHandler("getData" + parts[1] + "!", [parts[0]]); + + // Try to fetch any internally stored data first + if ( data === undefined && this.length ) { + data = jQuery.data( this[0], key ); + data = dataAttr( this[0], key, data ); + } + + return data === undefined && parts[1] ? + this.data( parts[0] ) : + data; + + } else { + return this.each(function() { + var self = jQuery( this ), + args = [ parts[0], value ]; + + self.triggerHandler( "setData" + parts[1] + "!", args ); + jQuery.data( this, key, value ); + self.triggerHandler( "changeData" + parts[1] + "!", args ); + }); + } + }, + + removeData: function( key ) { + return this.each(function() { + jQuery.removeData( this, key ); + }); + } +}); + +function dataAttr( elem, key, data ) { + // If nothing was found internally, try to fetch any + // data from the HTML5 data-* attribute + if ( data === undefined && elem.nodeType === 1 ) { + + var name = "data-" + key.replace( rmultiDash, "-$1" ).toLowerCase(); + + data = elem.getAttribute( name ); + + if ( typeof data === "string" ) { + try { + data = data === "true" ? true : + data === "false" ? false : + data === "null" ? null : + jQuery.isNumeric( data ) ? parseFloat( data ) : + rbrace.test( data ) ? jQuery.parseJSON( data ) : + data; + } catch( e ) {} + + // Make sure we set the data so it isn't changed later + jQuery.data( elem, key, data ); + + } else { + data = undefined; + } + } + + return data; +} + +// checks a cache object for emptiness +function isEmptyDataObject( obj ) { + for ( var name in obj ) { + + // if the public data object is empty, the private is still empty + if ( name === "data" && jQuery.isEmptyObject( obj[name] ) ) { + continue; + } + if ( name !== "toJSON" ) { + return false; + } + } + + return true; +} + + + + +function handleQueueMarkDefer( elem, type, src ) { + var deferDataKey = type + "defer", + queueDataKey = type + "queue", + markDataKey = type + "mark", + defer = jQuery._data( elem, deferDataKey ); + if ( defer && + ( src === "queue" || !jQuery._data(elem, queueDataKey) ) && + ( src === "mark" || !jQuery._data(elem, markDataKey) ) ) { + // Give room for hard-coded callbacks to fire first + // and eventually mark/queue something else on the element + setTimeout( function() { + if ( !jQuery._data( elem, queueDataKey ) && + !jQuery._data( elem, markDataKey ) ) { + jQuery.removeData( elem, deferDataKey, true ); + defer.fire(); + } + }, 0 ); + } +} + +jQuery.extend({ + + _mark: function( elem, type ) { + if ( elem ) { + type = ( type || "fx" ) + "mark"; + jQuery._data( elem, type, (jQuery._data( elem, type ) || 0) + 1 ); + } + }, + + _unmark: function( force, elem, type ) { + if ( force !== true ) { + type = elem; + elem = force; + force = false; + } + if ( elem ) { + type = type || "fx"; + var key = type + "mark", + count = force ? 0 : ( (jQuery._data( elem, key ) || 1) - 1 ); + if ( count ) { + jQuery._data( elem, key, count ); + } else { + jQuery.removeData( elem, key, true ); + handleQueueMarkDefer( elem, type, "mark" ); + } + } + }, + + queue: function( elem, type, data ) { + var q; + if ( elem ) { + type = ( type || "fx" ) + "queue"; + q = jQuery._data( elem, type ); + + // Speed up dequeue by getting out quickly if this is just a lookup + if ( data ) { + if ( !q || jQuery.isArray(data) ) { + q = jQuery._data( elem, type, jQuery.makeArray(data) ); + } else { + q.push( data ); + } + } + return q || []; + } + }, + + dequeue: function( elem, type ) { + type = type || "fx"; + + var queue = jQuery.queue( elem, type ), + fn = queue.shift(), + hooks = {}; + + // If the fx queue is dequeued, always remove the progress sentinel + if ( fn === "inprogress" ) { + fn = queue.shift(); + } + + if ( fn ) { + // Add a progress sentinel to prevent the fx queue from being + // automatically dequeued + if ( type === "fx" ) { + queue.unshift( "inprogress" ); + } + + jQuery._data( elem, type + ".run", hooks ); + fn.call( elem, function() { + jQuery.dequeue( elem, type ); + }, hooks ); + } + + if ( !queue.length ) { + jQuery.removeData( elem, type + "queue " + type + ".run", true ); + handleQueueMarkDefer( elem, type, "queue" ); + } + } +}); + +jQuery.fn.extend({ + queue: function( type, data ) { + if ( typeof type !== "string" ) { + data = type; + type = "fx"; + } + + if ( data === undefined ) { + return jQuery.queue( this[0], type ); + } + return this.each(function() { + var queue = jQuery.queue( this, type, data ); + + if ( type === "fx" && queue[0] !== "inprogress" ) { + jQuery.dequeue( this, type ); + } + }); + }, + dequeue: function( type ) { + return this.each(function() { + jQuery.dequeue( this, type ); + }); + }, + // Based off of the plugin by Clint Helfers, with permission. + // http://blindsignals.com/index.php/2009/07/jquery-delay/ + delay: function( time, type ) { + time = jQuery.fx ? jQuery.fx.speeds[ time ] || time : time; + type = type || "fx"; + + return this.queue( type, function( next, hooks ) { + var timeout = setTimeout( next, time ); + hooks.stop = function() { + clearTimeout( timeout ); + }; + }); + }, + clearQueue: function( type ) { + return this.queue( type || "fx", [] ); + }, + // Get a promise resolved when queues of a certain type + // are emptied (fx is the type by default) + promise: function( type, object ) { + if ( typeof type !== "string" ) { + object = type; + type = undefined; + } + type = type || "fx"; + var defer = jQuery.Deferred(), + elements = this, + i = elements.length, + count = 1, + deferDataKey = type + "defer", + queueDataKey = type + "queue", + markDataKey = type + "mark", + tmp; + function resolve() { + if ( !( --count ) ) { + defer.resolveWith( elements, [ elements ] ); + } + } + while( i-- ) { + if (( tmp = jQuery.data( elements[ i ], deferDataKey, undefined, true ) || + ( jQuery.data( elements[ i ], queueDataKey, undefined, true ) || + jQuery.data( elements[ i ], markDataKey, undefined, true ) ) && + jQuery.data( elements[ i ], deferDataKey, jQuery.Callbacks( "once memory" ), true ) )) { + count++; + tmp.add( resolve ); + } + } + resolve(); + return defer.promise(); + } +}); + + + + +var rclass = /[\n\t\r]/g, + rspace = /\s+/, + rreturn = /\r/g, + rtype = /^(?:button|input)$/i, + rfocusable = /^(?:button|input|object|select|textarea)$/i, + rclickable = /^a(?:rea)?$/i, + rboolean = /^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i, + getSetAttribute = jQuery.support.getSetAttribute, + nodeHook, boolHook, fixSpecified; + +jQuery.fn.extend({ + attr: function( name, value ) { + return jQuery.access( this, name, value, true, jQuery.attr ); + }, + + removeAttr: function( name ) { + return this.each(function() { + jQuery.removeAttr( this, name ); + }); + }, + + prop: function( name, value ) { + return jQuery.access( this, name, value, true, jQuery.prop ); + }, + + removeProp: function( name ) { + name = jQuery.propFix[ name ] || name; + return this.each(function() { + // try/catch handles cases where IE balks (such as removing a property on window) + try { + this[ name ] = undefined; + delete this[ name ]; + } catch( e ) {} + }); + }, + + addClass: function( value ) { + var classNames, i, l, elem, + setClass, c, cl; + + if ( jQuery.isFunction( value ) ) { + return this.each(function( j ) { + jQuery( this ).addClass( value.call(this, j, this.className) ); + }); + } + + if ( value && typeof value === "string" ) { + classNames = value.split( rspace ); + + for ( i = 0, l = this.length; i < l; i++ ) { + elem = this[ i ]; + + if ( elem.nodeType === 1 ) { + if ( !elem.className && classNames.length === 1 ) { + elem.className = value; + + } else { + setClass = " " + elem.className + " "; + + for ( c = 0, cl = classNames.length; c < cl; c++ ) { + if ( !~setClass.indexOf( " " + classNames[ c ] + " " ) ) { + setClass += classNames[ c ] + " "; + } + } + elem.className = jQuery.trim( setClass ); + } + } + } + } + + return this; + }, + + removeClass: function( value ) { + var classNames, i, l, elem, className, c, cl; + + if ( jQuery.isFunction( value ) ) { + return this.each(function( j ) { + jQuery( this ).removeClass( value.call(this, j, this.className) ); + }); + } + + if ( (value && typeof value === "string") || value === undefined ) { + classNames = ( value || "" ).split( rspace ); + + for ( i = 0, l = this.length; i < l; i++ ) { + elem = this[ i ]; + + if ( elem.nodeType === 1 && elem.className ) { + if ( value ) { + className = (" " + elem.className + " ").replace( rclass, " " ); + for ( c = 0, cl = classNames.length; c < cl; c++ ) { + className = className.replace(" " + classNames[ c ] + " ", " "); + } + elem.className = jQuery.trim( className ); + + } else { + elem.className = ""; + } + } + } + } + + return this; + }, + + toggleClass: function( value, stateVal ) { + var type = typeof value, + isBool = typeof stateVal === "boolean"; + + if ( jQuery.isFunction( value ) ) { + return this.each(function( i ) { + jQuery( this ).toggleClass( value.call(this, i, this.className, stateVal), stateVal ); + }); + } + + return this.each(function() { + if ( type === "string" ) { + // toggle individual class names + var className, + i = 0, + self = jQuery( this ), + state = stateVal, + classNames = value.split( rspace ); + + while ( (className = classNames[ i++ ]) ) { + // check each className given, space seperated list + state = isBool ? state : !self.hasClass( className ); + self[ state ? "addClass" : "removeClass" ]( className ); + } + + } else if ( type === "undefined" || type === "boolean" ) { + if ( this.className ) { + // store className if set + jQuery._data( this, "__className__", this.className ); + } + + // toggle whole className + this.className = this.className || value === false ? "" : jQuery._data( this, "__className__" ) || ""; + } + }); + }, + + hasClass: function( selector ) { + var className = " " + selector + " ", + i = 0, + l = this.length; + for ( ; i < l; i++ ) { + if ( this[i].nodeType === 1 && (" " + this[i].className + " ").replace(rclass, " ").indexOf( className ) > -1 ) { + return true; + } + } + + return false; + }, + + val: function( value ) { + var hooks, ret, isFunction, + elem = this[0]; + + if ( !arguments.length ) { + if ( elem ) { + hooks = jQuery.valHooks[ elem.nodeName.toLowerCase() ] || jQuery.valHooks[ elem.type ]; + + if ( hooks && "get" in hooks && (ret = hooks.get( elem, "value" )) !== undefined ) { + return ret; + } + + ret = elem.value; + + return typeof ret === "string" ? + // handle most common string cases + ret.replace(rreturn, "") : + // handle cases where value is null/undef or number + ret == null ? "" : ret; + } + + return; + } + + isFunction = jQuery.isFunction( value ); + + return this.each(function( i ) { + var self = jQuery(this), val; + + if ( this.nodeType !== 1 ) { + return; + } + + if ( isFunction ) { + val = value.call( this, i, self.val() ); + } else { + val = value; + } + + // Treat null/undefined as ""; convert numbers to string + if ( val == null ) { + val = ""; + } else if ( typeof val === "number" ) { + val += ""; + } else if ( jQuery.isArray( val ) ) { + val = jQuery.map(val, function ( value ) { + return value == null ? "" : value + ""; + }); + } + + hooks = jQuery.valHooks[ this.nodeName.toLowerCase() ] || jQuery.valHooks[ this.type ]; + + // If set returns undefined, fall back to normal setting + if ( !hooks || !("set" in hooks) || hooks.set( this, val, "value" ) === undefined ) { + this.value = val; + } + }); + } +}); + +jQuery.extend({ + valHooks: { + option: { + get: function( elem ) { + // attributes.value is undefined in Blackberry 4.7 but + // uses .value. See #6932 + var val = elem.attributes.value; + return !val || val.specified ? elem.value : elem.text; + } + }, + select: { + get: function( elem ) { + var value, i, max, option, + index = elem.selectedIndex, + values = [], + options = elem.options, + one = elem.type === "select-one"; + + // Nothing was selected + if ( index < 0 ) { + return null; + } + + // Loop through all the selected options + i = one ? index : 0; + max = one ? index + 1 : options.length; + for ( ; i < max; i++ ) { + option = options[ i ]; + + // Don't return options that are disabled or in a disabled optgroup + if ( option.selected && (jQuery.support.optDisabled ? !option.disabled : option.getAttribute("disabled") === null) && + (!option.parentNode.disabled || !jQuery.nodeName( option.parentNode, "optgroup" )) ) { + + // Get the specific value for the option + value = jQuery( option ).val(); + + // We don't need an array for one selects + if ( one ) { + return value; + } + + // Multi-Selects return an array + values.push( value ); + } + } + + // Fixes Bug #2551 -- select.val() broken in IE after form.reset() + if ( one && !values.length && options.length ) { + return jQuery( options[ index ] ).val(); + } + + return values; + }, + + set: function( elem, value ) { + var values = jQuery.makeArray( value ); + + jQuery(elem).find("option").each(function() { + this.selected = jQuery.inArray( jQuery(this).val(), values ) >= 0; + }); + + if ( !values.length ) { + elem.selectedIndex = -1; + } + return values; + } + } + }, + + attrFn: { + val: true, + css: true, + html: true, + text: true, + data: true, + width: true, + height: true, + offset: true + }, + + attr: function( elem, name, value, pass ) { + var ret, hooks, notxml, + nType = elem.nodeType; + + // don't get/set attributes on text, comment and attribute nodes + if ( !elem || nType === 3 || nType === 8 || nType === 2 ) { + return; + } + + if ( pass && name in jQuery.attrFn ) { + return jQuery( elem )[ name ]( value ); + } + + // Fallback to prop when attributes are not supported + if ( typeof elem.getAttribute === "undefined" ) { + return jQuery.prop( elem, name, value ); + } + + notxml = nType !== 1 || !jQuery.isXMLDoc( elem ); + + // All attributes are lowercase + // Grab necessary hook if one is defined + if ( notxml ) { + name = name.toLowerCase(); + hooks = jQuery.attrHooks[ name ] || ( rboolean.test( name ) ? boolHook : nodeHook ); + } + + if ( value !== undefined ) { + + if ( value === null ) { + jQuery.removeAttr( elem, name ); + return; + + } else if ( hooks && "set" in hooks && notxml && (ret = hooks.set( elem, value, name )) !== undefined ) { + return ret; + + } else { + elem.setAttribute( name, "" + value ); + return value; + } + + } else if ( hooks && "get" in hooks && notxml && (ret = hooks.get( elem, name )) !== null ) { + return ret; + + } else { + + ret = elem.getAttribute( name ); + + // Non-existent attributes return null, we normalize to undefined + return ret === null ? + undefined : + ret; + } + }, + + removeAttr: function( elem, value ) { + var propName, attrNames, name, l, + i = 0; + + if ( value && elem.nodeType === 1 ) { + attrNames = value.toLowerCase().split( rspace ); + l = attrNames.length; + + for ( ; i < l; i++ ) { + name = attrNames[ i ]; + + if ( name ) { + propName = jQuery.propFix[ name ] || name; + + // See #9699 for explanation of this approach (setting first, then removal) + jQuery.attr( elem, name, "" ); + elem.removeAttribute( getSetAttribute ? name : propName ); + + // Set corresponding property to false for boolean attributes + if ( rboolean.test( name ) && propName in elem ) { + elem[ propName ] = false; + } + } + } + } + }, + + attrHooks: { + type: { + set: function( elem, value ) { + // We can't allow the type property to be changed (since it causes problems in IE) + if ( rtype.test( elem.nodeName ) && elem.parentNode ) { + jQuery.error( "type property can't be changed" ); + } else if ( !jQuery.support.radioValue && value === "radio" && jQuery.nodeName(elem, "input") ) { + // Setting the type on a radio button after the value resets the value in IE6-9 + // Reset value to it's default in case type is set after value + // This is for element creation + var val = elem.value; + elem.setAttribute( "type", value ); + if ( val ) { + elem.value = val; + } + return value; + } + } + }, + // Use the value property for back compat + // Use the nodeHook for button elements in IE6/7 (#1954) + value: { + get: function( elem, name ) { + if ( nodeHook && jQuery.nodeName( elem, "button" ) ) { + return nodeHook.get( elem, name ); + } + return name in elem ? + elem.value : + null; + }, + set: function( elem, value, name ) { + if ( nodeHook && jQuery.nodeName( elem, "button" ) ) { + return nodeHook.set( elem, value, name ); + } + // Does not return so that setAttribute is also used + elem.value = value; + } + } + }, + + propFix: { + tabindex: "tabIndex", + readonly: "readOnly", + "for": "htmlFor", + "class": "className", + maxlength: "maxLength", + cellspacing: "cellSpacing", + cellpadding: "cellPadding", + rowspan: "rowSpan", + colspan: "colSpan", + usemap: "useMap", + frameborder: "frameBorder", + contenteditable: "contentEditable" + }, + + prop: function( elem, name, value ) { + var ret, hooks, notxml, + nType = elem.nodeType; + + // don't get/set properties on text, comment and attribute nodes + if ( !elem || nType === 3 || nType === 8 || nType === 2 ) { + return; + } + + notxml = nType !== 1 || !jQuery.isXMLDoc( elem ); + + if ( notxml ) { + // Fix name and attach hooks + name = jQuery.propFix[ name ] || name; + hooks = jQuery.propHooks[ name ]; + } + + if ( value !== undefined ) { + if ( hooks && "set" in hooks && (ret = hooks.set( elem, value, name )) !== undefined ) { + return ret; + + } else { + return ( elem[ name ] = value ); + } + + } else { + if ( hooks && "get" in hooks && (ret = hooks.get( elem, name )) !== null ) { + return ret; + + } else { + return elem[ name ]; + } + } + }, + + propHooks: { + tabIndex: { + get: function( elem ) { + // elem.tabIndex doesn't always return the correct value when it hasn't been explicitly set + // http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/ + var attributeNode = elem.getAttributeNode("tabindex"); + + return attributeNode && attributeNode.specified ? + parseInt( attributeNode.value, 10 ) : + rfocusable.test( elem.nodeName ) || rclickable.test( elem.nodeName ) && elem.href ? + 0 : + undefined; + } + } + } +}); + +// Add the tabIndex propHook to attrHooks for back-compat (different case is intentional) +jQuery.attrHooks.tabindex = jQuery.propHooks.tabIndex; + +// Hook for boolean attributes +boolHook = { + get: function( elem, name ) { + // Align boolean attributes with corresponding properties + // Fall back to attribute presence where some booleans are not supported + var attrNode, + property = jQuery.prop( elem, name ); + return property === true || typeof property !== "boolean" && ( attrNode = elem.getAttributeNode(name) ) && attrNode.nodeValue !== false ? + name.toLowerCase() : + undefined; + }, + set: function( elem, value, name ) { + var propName; + if ( value === false ) { + // Remove boolean attributes when set to false + jQuery.removeAttr( elem, name ); + } else { + // value is true since we know at this point it's type boolean and not false + // Set boolean attributes to the same name and set the DOM property + propName = jQuery.propFix[ name ] || name; + if ( propName in elem ) { + // Only set the IDL specifically if it already exists on the element + elem[ propName ] = true; + } + + elem.setAttribute( name, name.toLowerCase() ); + } + return name; + } +}; + +// IE6/7 do not support getting/setting some attributes with get/setAttribute +if ( !getSetAttribute ) { + + fixSpecified = { + name: true, + id: true + }; + + // Use this for any attribute in IE6/7 + // This fixes almost every IE6/7 issue + nodeHook = jQuery.valHooks.button = { + get: function( elem, name ) { + var ret; + ret = elem.getAttributeNode( name ); + return ret && ( fixSpecified[ name ] ? ret.nodeValue !== "" : ret.specified ) ? + ret.nodeValue : + undefined; + }, + set: function( elem, value, name ) { + // Set the existing or create a new attribute node + var ret = elem.getAttributeNode( name ); + if ( !ret ) { + ret = document.createAttribute( name ); + elem.setAttributeNode( ret ); + } + return ( ret.nodeValue = value + "" ); + } + }; + + // Apply the nodeHook to tabindex + jQuery.attrHooks.tabindex.set = nodeHook.set; + + // Set width and height to auto instead of 0 on empty string( Bug #8150 ) + // This is for removals + jQuery.each([ "width", "height" ], function( i, name ) { + jQuery.attrHooks[ name ] = jQuery.extend( jQuery.attrHooks[ name ], { + set: function( elem, value ) { + if ( value === "" ) { + elem.setAttribute( name, "auto" ); + return value; + } + } + }); + }); + + // Set contenteditable to false on removals(#10429) + // Setting to empty string throws an error as an invalid value + jQuery.attrHooks.contenteditable = { + get: nodeHook.get, + set: function( elem, value, name ) { + if ( value === "" ) { + value = "false"; + } + nodeHook.set( elem, value, name ); + } + }; +} + + +// Some attributes require a special call on IE +if ( !jQuery.support.hrefNormalized ) { + jQuery.each([ "href", "src", "width", "height" ], function( i, name ) { + jQuery.attrHooks[ name ] = jQuery.extend( jQuery.attrHooks[ name ], { + get: function( elem ) { + var ret = elem.getAttribute( name, 2 ); + return ret === null ? undefined : ret; + } + }); + }); +} + +if ( !jQuery.support.style ) { + jQuery.attrHooks.style = { + get: function( elem ) { + // Return undefined in the case of empty string + // Normalize to lowercase since IE uppercases css property names + return elem.style.cssText.toLowerCase() || undefined; + }, + set: function( elem, value ) { + return ( elem.style.cssText = "" + value ); + } + }; +} + +// Safari mis-reports the default selected property of an option +// Accessing the parent's selectedIndex property fixes it +if ( !jQuery.support.optSelected ) { + jQuery.propHooks.selected = jQuery.extend( jQuery.propHooks.selected, { + get: function( elem ) { + var parent = elem.parentNode; + + if ( parent ) { + parent.selectedIndex; + + // Make sure that it also works with optgroups, see #5701 + if ( parent.parentNode ) { + parent.parentNode.selectedIndex; + } + } + return null; + } + }); +} + +// IE6/7 call enctype encoding +if ( !jQuery.support.enctype ) { + jQuery.propFix.enctype = "encoding"; +} + +// Radios and checkboxes getter/setter +if ( !jQuery.support.checkOn ) { + jQuery.each([ "radio", "checkbox" ], function() { + jQuery.valHooks[ this ] = { + get: function( elem ) { + // Handle the case where in Webkit "" is returned instead of "on" if a value isn't specified + return elem.getAttribute("value") === null ? "on" : elem.value; + } + }; + }); +} +jQuery.each([ "radio", "checkbox" ], function() { + jQuery.valHooks[ this ] = jQuery.extend( jQuery.valHooks[ this ], { + set: function( elem, value ) { + if ( jQuery.isArray( value ) ) { + return ( elem.checked = jQuery.inArray( jQuery(elem).val(), value ) >= 0 ); + } + } + }); +}); + + + + +var rformElems = /^(?:textarea|input|select)$/i, + rtypenamespace = /^([^\.]*)?(?:\.(.+))?$/, + rhoverHack = /\bhover(\.\S+)?\b/, + rkeyEvent = /^key/, + rmouseEvent = /^(?:mouse|contextmenu)|click/, + rfocusMorph = /^(?:focusinfocus|focusoutblur)$/, + rquickIs = /^(\w*)(?:#([\w\-]+))?(?:\.([\w\-]+))?$/, + quickParse = function( selector ) { + var quick = rquickIs.exec( selector ); + if ( quick ) { + // 0 1 2 3 + // [ _, tag, id, class ] + quick[1] = ( quick[1] || "" ).toLowerCase(); + quick[3] = quick[3] && new RegExp( "(?:^|\\s)" + quick[3] + "(?:\\s|$)" ); + } + return quick; + }, + quickIs = function( elem, m ) { + var attrs = elem.attributes || {}; + return ( + (!m[1] || elem.nodeName.toLowerCase() === m[1]) && + (!m[2] || (attrs.id || {}).value === m[2]) && + (!m[3] || m[3].test( (attrs[ "class" ] || {}).value )) + ); + }, + hoverHack = function( events ) { + return jQuery.event.special.hover ? events : events.replace( rhoverHack, "mouseenter$1 mouseleave$1" ); + }; + +/* + * Helper functions for managing events -- not part of the public interface. + * Props to Dean Edwards' addEvent library for many of the ideas. + */ +jQuery.event = { + + add: function( elem, types, handler, data, selector ) { + + var elemData, eventHandle, events, + t, tns, type, namespaces, handleObj, + handleObjIn, quick, handlers, special; + + // Don't attach events to noData or text/comment nodes (allow plain objects tho) + if ( elem.nodeType === 3 || elem.nodeType === 8 || !types || !handler || !(elemData = jQuery._data( elem )) ) { + return; + } + + // Caller can pass in an object of custom data in lieu of the handler + if ( handler.handler ) { + handleObjIn = handler; + handler = handleObjIn.handler; + } + + // Make sure that the handler has a unique ID, used to find/remove it later + if ( !handler.guid ) { + handler.guid = jQuery.guid++; + } + + // Init the element's event structure and main handler, if this is the first + events = elemData.events; + if ( !events ) { + elemData.events = events = {}; + } + eventHandle = elemData.handle; + if ( !eventHandle ) { + elemData.handle = eventHandle = function( e ) { + // Discard the second event of a jQuery.event.trigger() and + // when an event is called after a page has unloaded + return typeof jQuery !== "undefined" && (!e || jQuery.event.triggered !== e.type) ? + jQuery.event.dispatch.apply( eventHandle.elem, arguments ) : + undefined; + }; + // Add elem as a property of the handle fn to prevent a memory leak with IE non-native events + eventHandle.elem = elem; + } + + // Handle multiple events separated by a space + // jQuery(...).bind("mouseover mouseout", fn); + types = jQuery.trim( hoverHack(types) ).split( " " ); + for ( t = 0; t < types.length; t++ ) { + + tns = rtypenamespace.exec( types[t] ) || []; + type = tns[1]; + namespaces = ( tns[2] || "" ).split( "." ).sort(); + + // If event changes its type, use the special event handlers for the changed type + special = jQuery.event.special[ type ] || {}; + + // If selector defined, determine special event api type, otherwise given type + type = ( selector ? special.delegateType : special.bindType ) || type; + + // Update special based on newly reset type + special = jQuery.event.special[ type ] || {}; + + // handleObj is passed to all event handlers + handleObj = jQuery.extend({ + type: type, + origType: tns[1], + data: data, + handler: handler, + guid: handler.guid, + selector: selector, + quick: quickParse( selector ), + namespace: namespaces.join(".") + }, handleObjIn ); + + // Init the event handler queue if we're the first + handlers = events[ type ]; + if ( !handlers ) { + handlers = events[ type ] = []; + handlers.delegateCount = 0; + + // Only use addEventListener/attachEvent if the special events handler returns false + if ( !special.setup || special.setup.call( elem, data, namespaces, eventHandle ) === false ) { + // Bind the global event handler to the element + if ( elem.addEventListener ) { + elem.addEventListener( type, eventHandle, false ); + + } else if ( elem.attachEvent ) { + elem.attachEvent( "on" + type, eventHandle ); + } + } + } + + if ( special.add ) { + special.add.call( elem, handleObj ); + + if ( !handleObj.handler.guid ) { + handleObj.handler.guid = handler.guid; + } + } + + // Add to the element's handler list, delegates in front + if ( selector ) { + handlers.splice( handlers.delegateCount++, 0, handleObj ); + } else { + handlers.push( handleObj ); + } + + // Keep track of which events have ever been used, for event optimization + jQuery.event.global[ type ] = true; + } + + // Nullify elem to prevent memory leaks in IE + elem = null; + }, + + global: {}, + + // Detach an event or set of events from an element + remove: function( elem, types, handler, selector, mappedTypes ) { + + var elemData = jQuery.hasData( elem ) && jQuery._data( elem ), + t, tns, type, origType, namespaces, origCount, + j, events, special, handle, eventType, handleObj; + + if ( !elemData || !(events = elemData.events) ) { + return; + } + + // Once for each type.namespace in types; type may be omitted + types = jQuery.trim( hoverHack( types || "" ) ).split(" "); + for ( t = 0; t < types.length; t++ ) { + tns = rtypenamespace.exec( types[t] ) || []; + type = origType = tns[1]; + namespaces = tns[2]; + + // Unbind all events (on this namespace, if provided) for the element + if ( !type ) { + for ( type in events ) { + jQuery.event.remove( elem, type + types[ t ], handler, selector, true ); + } + continue; + } + + special = jQuery.event.special[ type ] || {}; + type = ( selector? special.delegateType : special.bindType ) || type; + eventType = events[ type ] || []; + origCount = eventType.length; + namespaces = namespaces ? new RegExp("(^|\\.)" + namespaces.split(".").sort().join("\\.(?:.*\\.)?") + "(\\.|$)") : null; + + // Remove matching events + for ( j = 0; j < eventType.length; j++ ) { + handleObj = eventType[ j ]; + + if ( ( mappedTypes || origType === handleObj.origType ) && + ( !handler || handler.guid === handleObj.guid ) && + ( !namespaces || namespaces.test( handleObj.namespace ) ) && + ( !selector || selector === handleObj.selector || selector === "**" && handleObj.selector ) ) { + eventType.splice( j--, 1 ); + + if ( handleObj.selector ) { + eventType.delegateCount--; + } + if ( special.remove ) { + special.remove.call( elem, handleObj ); + } + } + } + + // Remove generic event handler if we removed something and no more handlers exist + // (avoids potential for endless recursion during removal of special event handlers) + if ( eventType.length === 0 && origCount !== eventType.length ) { + if ( !special.teardown || special.teardown.call( elem, namespaces ) === false ) { + jQuery.removeEvent( elem, type, elemData.handle ); + } + + delete events[ type ]; + } + } + + // Remove the expando if it's no longer used + if ( jQuery.isEmptyObject( events ) ) { + handle = elemData.handle; + if ( handle ) { + handle.elem = null; + } + + // removeData also checks for emptiness and clears the expando if empty + // so use it instead of delete + jQuery.removeData( elem, [ "events", "handle" ], true ); + } + }, + + // Events that are safe to short-circuit if no handlers are attached. + // Native DOM events should not be added, they may have inline handlers. + customEvent: { + "getData": true, + "setData": true, + "changeData": true + }, + + trigger: function( event, data, elem, onlyHandlers ) { + // Don't do events on text and comment nodes + if ( elem && (elem.nodeType === 3 || elem.nodeType === 8) ) { + return; + } + + // Event object or event type + var type = event.type || event, + namespaces = [], + cache, exclusive, i, cur, old, ontype, special, handle, eventPath, bubbleType; + + // focus/blur morphs to focusin/out; ensure we're not firing them right now + if ( rfocusMorph.test( type + jQuery.event.triggered ) ) { + return; + } + + if ( type.indexOf( "!" ) >= 0 ) { + // Exclusive events trigger only for the exact event (no namespaces) + type = type.slice(0, -1); + exclusive = true; + } + + if ( type.indexOf( "." ) >= 0 ) { + // Namespaced trigger; create a regexp to match event type in handle() + namespaces = type.split("."); + type = namespaces.shift(); + namespaces.sort(); + } + + if ( (!elem || jQuery.event.customEvent[ type ]) && !jQuery.event.global[ type ] ) { + // No jQuery handlers for this event type, and it can't have inline handlers + return; + } + + // Caller can pass in an Event, Object, or just an event type string + event = typeof event === "object" ? + // jQuery.Event object + event[ jQuery.expando ] ? event : + // Object literal + new jQuery.Event( type, event ) : + // Just the event type (string) + new jQuery.Event( type ); + + event.type = type; + event.isTrigger = true; + event.exclusive = exclusive; + event.namespace = namespaces.join( "." ); + event.namespace_re = event.namespace? new RegExp("(^|\\.)" + namespaces.join("\\.(?:.*\\.)?") + "(\\.|$)") : null; + ontype = type.indexOf( ":" ) < 0 ? "on" + type : ""; + + // Handle a global trigger + if ( !elem ) { + + // TODO: Stop taunting the data cache; remove global events and always attach to document + cache = jQuery.cache; + for ( i in cache ) { + if ( cache[ i ].events && cache[ i ].events[ type ] ) { + jQuery.event.trigger( event, data, cache[ i ].handle.elem, true ); + } + } + return; + } + + // Clean up the event in case it is being reused + event.result = undefined; + if ( !event.target ) { + event.target = elem; + } + + // Clone any incoming data and prepend the event, creating the handler arg list + data = data != null ? jQuery.makeArray( data ) : []; + data.unshift( event ); + + // Allow special events to draw outside the lines + special = jQuery.event.special[ type ] || {}; + if ( special.trigger && special.trigger.apply( elem, data ) === false ) { + return; + } + + // Determine event propagation path in advance, per W3C events spec (#9951) + // Bubble up to document, then to window; watch for a global ownerDocument var (#9724) + eventPath = [[ elem, special.bindType || type ]]; + if ( !onlyHandlers && !special.noBubble && !jQuery.isWindow( elem ) ) { + + bubbleType = special.delegateType || type; + cur = rfocusMorph.test( bubbleType + type ) ? elem : elem.parentNode; + old = null; + for ( ; cur; cur = cur.parentNode ) { + eventPath.push([ cur, bubbleType ]); + old = cur; + } + + // Only add window if we got to document (e.g., not plain obj or detached DOM) + if ( old && old === elem.ownerDocument ) { + eventPath.push([ old.defaultView || old.parentWindow || window, bubbleType ]); + } + } + + // Fire handlers on the event path + for ( i = 0; i < eventPath.length && !event.isPropagationStopped(); i++ ) { + + cur = eventPath[i][0]; + event.type = eventPath[i][1]; + + handle = ( jQuery._data( cur, "events" ) || {} )[ event.type ] && jQuery._data( cur, "handle" ); + if ( handle ) { + handle.apply( cur, data ); + } + // Note that this is a bare JS function and not a jQuery handler + handle = ontype && cur[ ontype ]; + if ( handle && jQuery.acceptData( cur ) && handle.apply( cur, data ) === false ) { + event.preventDefault(); + } + } + event.type = type; + + // If nobody prevented the default action, do it now + if ( !onlyHandlers && !event.isDefaultPrevented() ) { + + if ( (!special._default || special._default.apply( elem.ownerDocument, data ) === false) && + !(type === "click" && jQuery.nodeName( elem, "a" )) && jQuery.acceptData( elem ) ) { + + // Call a native DOM method on the target with the same name name as the event. + // Can't use an .isFunction() check here because IE6/7 fails that test. + // Don't do default actions on window, that's where global variables be (#6170) + // IE<9 dies on focus/blur to hidden element (#1486) + if ( ontype && elem[ type ] && ((type !== "focus" && type !== "blur") || event.target.offsetWidth !== 0) && !jQuery.isWindow( elem ) ) { + + // Don't re-trigger an onFOO event when we call its FOO() method + old = elem[ ontype ]; + + if ( old ) { + elem[ ontype ] = null; + } + + // Prevent re-triggering of the same event, since we already bubbled it above + jQuery.event.triggered = type; + elem[ type ](); + jQuery.event.triggered = undefined; + + if ( old ) { + elem[ ontype ] = old; + } + } + } + } + + return event.result; + }, + + dispatch: function( event ) { + + // Make a writable jQuery.Event from the native event object + event = jQuery.event.fix( event || window.event ); + + var handlers = ( (jQuery._data( this, "events" ) || {} )[ event.type ] || []), + delegateCount = handlers.delegateCount, + args = [].slice.call( arguments, 0 ), + run_all = !event.exclusive && !event.namespace, + handlerQueue = [], + i, j, cur, jqcur, ret, selMatch, matched, matches, handleObj, sel, related; + + // Use the fix-ed jQuery.Event rather than the (read-only) native event + args[0] = event; + event.delegateTarget = this; + + // Determine handlers that should run if there are delegated events + // Avoid disabled elements in IE (#6911) and non-left-click bubbling in Firefox (#3861) + if ( delegateCount && !event.target.disabled && !(event.button && event.type === "click") ) { + + // Pregenerate a single jQuery object for reuse with .is() + jqcur = jQuery(this); + jqcur.context = this.ownerDocument || this; + + for ( cur = event.target; cur != this; cur = cur.parentNode || this ) { + selMatch = {}; + matches = []; + jqcur[0] = cur; + for ( i = 0; i < delegateCount; i++ ) { + handleObj = handlers[ i ]; + sel = handleObj.selector; + + if ( selMatch[ sel ] === undefined ) { + selMatch[ sel ] = ( + handleObj.quick ? quickIs( cur, handleObj.quick ) : jqcur.is( sel ) + ); + } + if ( selMatch[ sel ] ) { + matches.push( handleObj ); + } + } + if ( matches.length ) { + handlerQueue.push({ elem: cur, matches: matches }); + } + } + } + + // Add the remaining (directly-bound) handlers + if ( handlers.length > delegateCount ) { + handlerQueue.push({ elem: this, matches: handlers.slice( delegateCount ) }); + } + + // Run delegates first; they may want to stop propagation beneath us + for ( i = 0; i < handlerQueue.length && !event.isPropagationStopped(); i++ ) { + matched = handlerQueue[ i ]; + event.currentTarget = matched.elem; + + for ( j = 0; j < matched.matches.length && !event.isImmediatePropagationStopped(); j++ ) { + handleObj = matched.matches[ j ]; + + // Triggered event must either 1) be non-exclusive and have no namespace, or + // 2) have namespace(s) a subset or equal to those in the bound event (both can have no namespace). + if ( run_all || (!event.namespace && !handleObj.namespace) || event.namespace_re && event.namespace_re.test( handleObj.namespace ) ) { + + event.data = handleObj.data; + event.handleObj = handleObj; + + ret = ( (jQuery.event.special[ handleObj.origType ] || {}).handle || handleObj.handler ) + .apply( matched.elem, args ); + + if ( ret !== undefined ) { + event.result = ret; + if ( ret === false ) { + event.preventDefault(); + event.stopPropagation(); + } + } + } + } + } + + return event.result; + }, + + // Includes some event props shared by KeyEvent and MouseEvent + // *** attrChange attrName relatedNode srcElement are not normalized, non-W3C, deprecated, will be removed in 1.8 *** + props: "attrChange attrName relatedNode srcElement altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "), + + fixHooks: {}, + + keyHooks: { + props: "char charCode key keyCode".split(" "), + filter: function( event, original ) { + + // Add which for key events + if ( event.which == null ) { + event.which = original.charCode != null ? original.charCode : original.keyCode; + } + + return event; + } + }, + + mouseHooks: { + props: "button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "), + filter: function( event, original ) { + var eventDoc, doc, body, + button = original.button, + fromElement = original.fromElement; + + // Calculate pageX/Y if missing and clientX/Y available + if ( event.pageX == null && original.clientX != null ) { + eventDoc = event.target.ownerDocument || document; + doc = eventDoc.documentElement; + body = eventDoc.body; + + event.pageX = original.clientX + ( doc && doc.scrollLeft || body && body.scrollLeft || 0 ) - ( doc && doc.clientLeft || body && body.clientLeft || 0 ); + event.pageY = original.clientY + ( doc && doc.scrollTop || body && body.scrollTop || 0 ) - ( doc && doc.clientTop || body && body.clientTop || 0 ); + } + + // Add relatedTarget, if necessary + if ( !event.relatedTarget && fromElement ) { + event.relatedTarget = fromElement === event.target ? original.toElement : fromElement; + } + + // Add which for click: 1 === left; 2 === middle; 3 === right + // Note: button is not normalized, so don't use it + if ( !event.which && button !== undefined ) { + event.which = ( button & 1 ? 1 : ( button & 2 ? 3 : ( button & 4 ? 2 : 0 ) ) ); + } + + return event; + } + }, + + fix: function( event ) { + if ( event[ jQuery.expando ] ) { + return event; + } + + // Create a writable copy of the event object and normalize some properties + var i, prop, + originalEvent = event, + fixHook = jQuery.event.fixHooks[ event.type ] || {}, + copy = fixHook.props ? this.props.concat( fixHook.props ) : this.props; + + event = jQuery.Event( originalEvent ); + + for ( i = copy.length; i; ) { + prop = copy[ --i ]; + event[ prop ] = originalEvent[ prop ]; + } + + // Fix target property, if necessary (#1925, IE 6/7/8 & Safari2) + if ( !event.target ) { + event.target = originalEvent.srcElement || document; + } + + // Target should not be a text node (#504, Safari) + if ( event.target.nodeType === 3 ) { + event.target = event.target.parentNode; + } + + // For mouse/key events; add metaKey if it's not there (#3368, IE6/7/8) + if ( event.metaKey === undefined ) { + event.metaKey = event.ctrlKey; + } + + return fixHook.filter? fixHook.filter( event, originalEvent ) : event; + }, + + special: { + ready: { + // Make sure the ready event is setup + setup: jQuery.bindReady + }, + + load: { + // Prevent triggered image.load events from bubbling to window.load + noBubble: true + }, + + focus: { + delegateType: "focusin" + }, + blur: { + delegateType: "focusout" + }, + + beforeunload: { + setup: function( data, namespaces, eventHandle ) { + // We only want to do this special case on windows + if ( jQuery.isWindow( this ) ) { + this.onbeforeunload = eventHandle; + } + }, + + teardown: function( namespaces, eventHandle ) { + if ( this.onbeforeunload === eventHandle ) { + this.onbeforeunload = null; + } + } + } + }, + + simulate: function( type, elem, event, bubble ) { + // Piggyback on a donor event to simulate a different one. + // Fake originalEvent to avoid donor's stopPropagation, but if the + // simulated event prevents default then we do the same on the donor. + var e = jQuery.extend( + new jQuery.Event(), + event, + { type: type, + isSimulated: true, + originalEvent: {} + } + ); + if ( bubble ) { + jQuery.event.trigger( e, null, elem ); + } else { + jQuery.event.dispatch.call( elem, e ); + } + if ( e.isDefaultPrevented() ) { + event.preventDefault(); + } + } +}; + +// Some plugins are using, but it's undocumented/deprecated and will be removed. +// The 1.7 special event interface should provide all the hooks needed now. +jQuery.event.handle = jQuery.event.dispatch; + +jQuery.removeEvent = document.removeEventListener ? + function( elem, type, handle ) { + if ( elem.removeEventListener ) { + elem.removeEventListener( type, handle, false ); + } + } : + function( elem, type, handle ) { + if ( elem.detachEvent ) { + elem.detachEvent( "on" + type, handle ); + } + }; + +jQuery.Event = function( src, props ) { + // Allow instantiation without the 'new' keyword + if ( !(this instanceof jQuery.Event) ) { + return new jQuery.Event( src, props ); + } + + // Event object + if ( src && src.type ) { + this.originalEvent = src; + this.type = src.type; + + // Events bubbling up the document may have been marked as prevented + // by a handler lower down the tree; reflect the correct value. + this.isDefaultPrevented = ( src.defaultPrevented || src.returnValue === false || + src.getPreventDefault && src.getPreventDefault() ) ? returnTrue : returnFalse; + + // Event type + } else { + this.type = src; + } + + // Put explicitly provided properties onto the event object + if ( props ) { + jQuery.extend( this, props ); + } + + // Create a timestamp if incoming event doesn't have one + this.timeStamp = src && src.timeStamp || jQuery.now(); + + // Mark it as fixed + this[ jQuery.expando ] = true; +}; + +function returnFalse() { + return false; +} +function returnTrue() { + return true; +} + +// jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding +// http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html +jQuery.Event.prototype = { + preventDefault: function() { + this.isDefaultPrevented = returnTrue; + + var e = this.originalEvent; + if ( !e ) { + return; + } + + // if preventDefault exists run it on the original event + if ( e.preventDefault ) { + e.preventDefault(); + + // otherwise set the returnValue property of the original event to false (IE) + } else { + e.returnValue = false; + } + }, + stopPropagation: function() { + this.isPropagationStopped = returnTrue; + + var e = this.originalEvent; + if ( !e ) { + return; + } + // if stopPropagation exists run it on the original event + if ( e.stopPropagation ) { + e.stopPropagation(); + } + // otherwise set the cancelBubble property of the original event to true (IE) + e.cancelBubble = true; + }, + stopImmediatePropagation: function() { + this.isImmediatePropagationStopped = returnTrue; + this.stopPropagation(); + }, + isDefaultPrevented: returnFalse, + isPropagationStopped: returnFalse, + isImmediatePropagationStopped: returnFalse +}; + +// Create mouseenter/leave events using mouseover/out and event-time checks +jQuery.each({ + mouseenter: "mouseover", + mouseleave: "mouseout" +}, function( orig, fix ) { + jQuery.event.special[ orig ] = { + delegateType: fix, + bindType: fix, + + handle: function( event ) { + var target = this, + related = event.relatedTarget, + handleObj = event.handleObj, + selector = handleObj.selector, + ret; + + // For mousenter/leave call the handler if related is outside the target. + // NB: No relatedTarget if the mouse left/entered the browser window + if ( !related || (related !== target && !jQuery.contains( target, related )) ) { + event.type = handleObj.origType; + ret = handleObj.handler.apply( this, arguments ); + event.type = fix; + } + return ret; + } + }; +}); + +// IE submit delegation +if ( !jQuery.support.submitBubbles ) { + + jQuery.event.special.submit = { + setup: function() { + // Only need this for delegated form submit events + if ( jQuery.nodeName( this, "form" ) ) { + return false; + } + + // Lazy-add a submit handler when a descendant form may potentially be submitted + jQuery.event.add( this, "click._submit keypress._submit", function( e ) { + // Node name check avoids a VML-related crash in IE (#9807) + var elem = e.target, + form = jQuery.nodeName( elem, "input" ) || jQuery.nodeName( elem, "button" ) ? elem.form : undefined; + if ( form && !form._submit_attached ) { + jQuery.event.add( form, "submit._submit", function( event ) { + // If form was submitted by the user, bubble the event up the tree + if ( this.parentNode && !event.isTrigger ) { + jQuery.event.simulate( "submit", this.parentNode, event, true ); + } + }); + form._submit_attached = true; + } + }); + // return undefined since we don't need an event listener + }, + + teardown: function() { + // Only need this for delegated form submit events + if ( jQuery.nodeName( this, "form" ) ) { + return false; + } + + // Remove delegated handlers; cleanData eventually reaps submit handlers attached above + jQuery.event.remove( this, "._submit" ); + } + }; +} + +// IE change delegation and checkbox/radio fix +if ( !jQuery.support.changeBubbles ) { + + jQuery.event.special.change = { + + setup: function() { + + if ( rformElems.test( this.nodeName ) ) { + // IE doesn't fire change on a check/radio until blur; trigger it on click + // after a propertychange. Eat the blur-change in special.change.handle. + // This still fires onchange a second time for check/radio after blur. + if ( this.type === "checkbox" || this.type === "radio" ) { + jQuery.event.add( this, "propertychange._change", function( event ) { + if ( event.originalEvent.propertyName === "checked" ) { + this._just_changed = true; + } + }); + jQuery.event.add( this, "click._change", function( event ) { + if ( this._just_changed && !event.isTrigger ) { + this._just_changed = false; + jQuery.event.simulate( "change", this, event, true ); + } + }); + } + return false; + } + // Delegated event; lazy-add a change handler on descendant inputs + jQuery.event.add( this, "beforeactivate._change", function( e ) { + var elem = e.target; + + if ( rformElems.test( elem.nodeName ) && !elem._change_attached ) { + jQuery.event.add( elem, "change._change", function( event ) { + if ( this.parentNode && !event.isSimulated && !event.isTrigger ) { + jQuery.event.simulate( "change", this.parentNode, event, true ); + } + }); + elem._change_attached = true; + } + }); + }, + + handle: function( event ) { + var elem = event.target; + + // Swallow native change events from checkbox/radio, we already triggered them above + if ( this !== elem || event.isSimulated || event.isTrigger || (elem.type !== "radio" && elem.type !== "checkbox") ) { + return event.handleObj.handler.apply( this, arguments ); + } + }, + + teardown: function() { + jQuery.event.remove( this, "._change" ); + + return rformElems.test( this.nodeName ); + } + }; +} + +// Create "bubbling" focus and blur events +if ( !jQuery.support.focusinBubbles ) { + jQuery.each({ focus: "focusin", blur: "focusout" }, function( orig, fix ) { + + // Attach a single capturing handler while someone wants focusin/focusout + var attaches = 0, + handler = function( event ) { + jQuery.event.simulate( fix, event.target, jQuery.event.fix( event ), true ); + }; + + jQuery.event.special[ fix ] = { + setup: function() { + if ( attaches++ === 0 ) { + document.addEventListener( orig, handler, true ); + } + }, + teardown: function() { + if ( --attaches === 0 ) { + document.removeEventListener( orig, handler, true ); + } + } + }; + }); +} + +jQuery.fn.extend({ + + on: function( types, selector, data, fn, /*INTERNAL*/ one ) { + var origFn, type; + + // Types can be a map of types/handlers + if ( typeof types === "object" ) { + // ( types-Object, selector, data ) + if ( typeof selector !== "string" ) { + // ( types-Object, data ) + data = selector; + selector = undefined; + } + for ( type in types ) { + this.on( type, selector, data, types[ type ], one ); + } + return this; + } + + if ( data == null && fn == null ) { + // ( types, fn ) + fn = selector; + data = selector = undefined; + } else if ( fn == null ) { + if ( typeof selector === "string" ) { + // ( types, selector, fn ) + fn = data; + data = undefined; + } else { + // ( types, data, fn ) + fn = data; + data = selector; + selector = undefined; + } + } + if ( fn === false ) { + fn = returnFalse; + } else if ( !fn ) { + return this; + } + + if ( one === 1 ) { + origFn = fn; + fn = function( event ) { + // Can use an empty set, since event contains the info + jQuery().off( event ); + return origFn.apply( this, arguments ); + }; + // Use same guid so caller can remove using origFn + fn.guid = origFn.guid || ( origFn.guid = jQuery.guid++ ); + } + return this.each( function() { + jQuery.event.add( this, types, fn, data, selector ); + }); + }, + one: function( types, selector, data, fn ) { + return this.on.call( this, types, selector, data, fn, 1 ); + }, + off: function( types, selector, fn ) { + if ( types && types.preventDefault && types.handleObj ) { + // ( event ) dispatched jQuery.Event + var handleObj = types.handleObj; + jQuery( types.delegateTarget ).off( + handleObj.namespace? handleObj.type + "." + handleObj.namespace : handleObj.type, + handleObj.selector, + handleObj.handler + ); + return this; + } + if ( typeof types === "object" ) { + // ( types-object [, selector] ) + for ( var type in types ) { + this.off( type, selector, types[ type ] ); + } + return this; + } + if ( selector === false || typeof selector === "function" ) { + // ( types [, fn] ) + fn = selector; + selector = undefined; + } + if ( fn === false ) { + fn = returnFalse; + } + return this.each(function() { + jQuery.event.remove( this, types, fn, selector ); + }); + }, + + bind: function( types, data, fn ) { + return this.on( types, null, data, fn ); + }, + unbind: function( types, fn ) { + return this.off( types, null, fn ); + }, + + live: function( types, data, fn ) { + jQuery( this.context ).on( types, this.selector, data, fn ); + return this; + }, + die: function( types, fn ) { + jQuery( this.context ).off( types, this.selector || "**", fn ); + return this; + }, + + delegate: function( selector, types, data, fn ) { + return this.on( types, selector, data, fn ); + }, + undelegate: function( selector, types, fn ) { + // ( namespace ) or ( selector, types [, fn] ) + return arguments.length == 1? this.off( selector, "**" ) : this.off( types, selector, fn ); + }, + + trigger: function( type, data ) { + return this.each(function() { + jQuery.event.trigger( type, data, this ); + }); + }, + triggerHandler: function( type, data ) { + if ( this[0] ) { + return jQuery.event.trigger( type, data, this[0], true ); + } + }, + + toggle: function( fn ) { + // Save reference to arguments for access in closure + var args = arguments, + guid = fn.guid || jQuery.guid++, + i = 0, + toggler = function( event ) { + // Figure out which function to execute + var lastToggle = ( jQuery._data( this, "lastToggle" + fn.guid ) || 0 ) % i; + jQuery._data( this, "lastToggle" + fn.guid, lastToggle + 1 ); + + // Make sure that clicks stop + event.preventDefault(); + + // and execute the function + return args[ lastToggle ].apply( this, arguments ) || false; + }; + + // link all the functions, so any of them can unbind this click handler + toggler.guid = guid; + while ( i < args.length ) { + args[ i++ ].guid = guid; + } + + return this.click( toggler ); + }, + + hover: function( fnOver, fnOut ) { + return this.mouseenter( fnOver ).mouseleave( fnOut || fnOver ); + } +}); + +jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblclick " + + "mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " + + "change select submit keydown keypress keyup error contextmenu").split(" "), function( i, name ) { + + // Handle event binding + jQuery.fn[ name ] = function( data, fn ) { + if ( fn == null ) { + fn = data; + data = null; + } + + return arguments.length > 0 ? + this.on( name, null, data, fn ) : + this.trigger( name ); + }; + + if ( jQuery.attrFn ) { + jQuery.attrFn[ name ] = true; + } + + if ( rkeyEvent.test( name ) ) { + jQuery.event.fixHooks[ name ] = jQuery.event.keyHooks; + } + + if ( rmouseEvent.test( name ) ) { + jQuery.event.fixHooks[ name ] = jQuery.event.mouseHooks; + } +}); + + + +/*! + * Sizzle CSS Selector Engine + * Copyright 2011, The Dojo Foundation + * Released under the MIT, BSD, and GPL Licenses. + * More information: http://sizzlejs.com/ + */ +(function(){ + +var chunker = /((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g, + expando = "sizcache" + (Math.random() + '').replace('.', ''), + done = 0, + toString = Object.prototype.toString, + hasDuplicate = false, + baseHasDuplicate = true, + rBackslash = /\\/g, + rReturn = /\r\n/g, + rNonWord = /\W/; + +// Here we check if the JavaScript engine is using some sort of +// optimization where it does not always call our comparision +// function. If that is the case, discard the hasDuplicate value. +// Thus far that includes Google Chrome. +[0, 0].sort(function() { + baseHasDuplicate = false; + return 0; +}); + +var Sizzle = function( selector, context, results, seed ) { + results = results || []; + context = context || document; + + var origContext = context; + + if ( context.nodeType !== 1 && context.nodeType !== 9 ) { + return []; + } + + if ( !selector || typeof selector !== "string" ) { + return results; + } + + var m, set, checkSet, extra, ret, cur, pop, i, + prune = true, + contextXML = Sizzle.isXML( context ), + parts = [], + soFar = selector; + + // Reset the position of the chunker regexp (start from head) + do { + chunker.exec( "" ); + m = chunker.exec( soFar ); + + if ( m ) { + soFar = m[3]; + + parts.push( m[1] ); + + if ( m[2] ) { + extra = m[3]; + break; + } + } + } while ( m ); + + if ( parts.length > 1 && origPOS.exec( selector ) ) { + + if ( parts.length === 2 && Expr.relative[ parts[0] ] ) { + set = posProcess( parts[0] + parts[1], context, seed ); + + } else { + set = Expr.relative[ parts[0] ] ? + [ context ] : + Sizzle( parts.shift(), context ); + + while ( parts.length ) { + selector = parts.shift(); + + if ( Expr.relative[ selector ] ) { + selector += parts.shift(); + } + + set = posProcess( selector, set, seed ); + } + } + + } else { + // Take a shortcut and set the context if the root selector is an ID + // (but not if it'll be faster if the inner selector is an ID) + if ( !seed && parts.length > 1 && context.nodeType === 9 && !contextXML && + Expr.match.ID.test(parts[0]) && !Expr.match.ID.test(parts[parts.length - 1]) ) { + + ret = Sizzle.find( parts.shift(), context, contextXML ); + context = ret.expr ? + Sizzle.filter( ret.expr, ret.set )[0] : + ret.set[0]; + } + + if ( context ) { + ret = seed ? + { expr: parts.pop(), set: makeArray(seed) } : + Sizzle.find( parts.pop(), parts.length === 1 && (parts[0] === "~" || parts[0] === "+") && context.parentNode ? context.parentNode : context, contextXML ); + + set = ret.expr ? + Sizzle.filter( ret.expr, ret.set ) : + ret.set; + + if ( parts.length > 0 ) { + checkSet = makeArray( set ); + + } else { + prune = false; + } + + while ( parts.length ) { + cur = parts.pop(); + pop = cur; + + if ( !Expr.relative[ cur ] ) { + cur = ""; + } else { + pop = parts.pop(); + } + + if ( pop == null ) { + pop = context; + } + + Expr.relative[ cur ]( checkSet, pop, contextXML ); + } + + } else { + checkSet = parts = []; + } + } + + if ( !checkSet ) { + checkSet = set; + } + + if ( !checkSet ) { + Sizzle.error( cur || selector ); + } + + if ( toString.call(checkSet) === "[object Array]" ) { + if ( !prune ) { + results.push.apply( results, checkSet ); + + } else if ( context && context.nodeType === 1 ) { + for ( i = 0; checkSet[i] != null; i++ ) { + if ( checkSet[i] && (checkSet[i] === true || checkSet[i].nodeType === 1 && Sizzle.contains(context, checkSet[i])) ) { + results.push( set[i] ); + } + } + + } else { + for ( i = 0; checkSet[i] != null; i++ ) { + if ( checkSet[i] && checkSet[i].nodeType === 1 ) { + results.push( set[i] ); + } + } + } + + } else { + makeArray( checkSet, results ); + } + + if ( extra ) { + Sizzle( extra, origContext, results, seed ); + Sizzle.uniqueSort( results ); + } + + return results; +}; + +Sizzle.uniqueSort = function( results ) { + if ( sortOrder ) { + hasDuplicate = baseHasDuplicate; + results.sort( sortOrder ); + + if ( hasDuplicate ) { + for ( var i = 1; i < results.length; i++ ) { + if ( results[i] === results[ i - 1 ] ) { + results.splice( i--, 1 ); + } + } + } + } + + return results; +}; + +Sizzle.matches = function( expr, set ) { + return Sizzle( expr, null, null, set ); +}; + +Sizzle.matchesSelector = function( node, expr ) { + return Sizzle( expr, null, null, [node] ).length > 0; +}; + +Sizzle.find = function( expr, context, isXML ) { + var set, i, len, match, type, left; + + if ( !expr ) { + return []; + } + + for ( i = 0, len = Expr.order.length; i < len; i++ ) { + type = Expr.order[i]; + + if ( (match = Expr.leftMatch[ type ].exec( expr )) ) { + left = match[1]; + match.splice( 1, 1 ); + + if ( left.substr( left.length - 1 ) !== "\\" ) { + match[1] = (match[1] || "").replace( rBackslash, "" ); + set = Expr.find[ type ]( match, context, isXML ); + + if ( set != null ) { + expr = expr.replace( Expr.match[ type ], "" ); + break; + } + } + } + } + + if ( !set ) { + set = typeof context.getElementsByTagName !== "undefined" ? + context.getElementsByTagName( "*" ) : + []; + } + + return { set: set, expr: expr }; +}; + +Sizzle.filter = function( expr, set, inplace, not ) { + var match, anyFound, + type, found, item, filter, left, + i, pass, + old = expr, + result = [], + curLoop = set, + isXMLFilter = set && set[0] && Sizzle.isXML( set[0] ); + + while ( expr && set.length ) { + for ( type in Expr.filter ) { + if ( (match = Expr.leftMatch[ type ].exec( expr )) != null && match[2] ) { + filter = Expr.filter[ type ]; + left = match[1]; + + anyFound = false; + + match.splice(1,1); + + if ( left.substr( left.length - 1 ) === "\\" ) { + continue; + } + + if ( curLoop === result ) { + result = []; + } + + if ( Expr.preFilter[ type ] ) { + match = Expr.preFilter[ type ]( match, curLoop, inplace, result, not, isXMLFilter ); + + if ( !match ) { + anyFound = found = true; + + } else if ( match === true ) { + continue; + } + } + + if ( match ) { + for ( i = 0; (item = curLoop[i]) != null; i++ ) { + if ( item ) { + found = filter( item, match, i, curLoop ); + pass = not ^ found; + + if ( inplace && found != null ) { + if ( pass ) { + anyFound = true; + + } else { + curLoop[i] = false; + } + + } else if ( pass ) { + result.push( item ); + anyFound = true; + } + } + } + } + + if ( found !== undefined ) { + if ( !inplace ) { + curLoop = result; + } + + expr = expr.replace( Expr.match[ type ], "" ); + + if ( !anyFound ) { + return []; + } + + break; + } + } + } + + // Improper expression + if ( expr === old ) { + if ( anyFound == null ) { + Sizzle.error( expr ); + + } else { + break; + } + } + + old = expr; + } + + return curLoop; +}; + +Sizzle.error = function( msg ) { + throw new Error( "Syntax error, unrecognized expression: " + msg ); +}; + +/** + * Utility function for retreiving the text value of an array of DOM nodes + * @param {Array|Element} elem + */ +var getText = Sizzle.getText = function( elem ) { + var i, node, + nodeType = elem.nodeType, + ret = ""; + + if ( nodeType ) { + if ( nodeType === 1 || nodeType === 9 ) { + // Use textContent || innerText for elements + if ( typeof elem.textContent === 'string' ) { + return elem.textContent; + } else if ( typeof elem.innerText === 'string' ) { + // Replace IE's carriage returns + return elem.innerText.replace( rReturn, '' ); + } else { + // Traverse it's children + for ( elem = elem.firstChild; elem; elem = elem.nextSibling) { + ret += getText( elem ); + } + } + } else if ( nodeType === 3 || nodeType === 4 ) { + return elem.nodeValue; + } + } else { + + // If no nodeType, this is expected to be an array + for ( i = 0; (node = elem[i]); i++ ) { + // Do not traverse comment nodes + if ( node.nodeType !== 8 ) { + ret += getText( node ); + } + } + } + return ret; +}; + +var Expr = Sizzle.selectors = { + order: [ "ID", "NAME", "TAG" ], + + match: { + ID: /#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/, + CLASS: /\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/, + NAME: /\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/, + ATTR: /\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(?:(['"])(.*?)\3|(#?(?:[\w\u00c0-\uFFFF\-]|\\.)*)|)|)\s*\]/, + TAG: /^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/, + CHILD: /:(only|nth|last|first)-child(?:\(\s*(even|odd|(?:[+\-]?\d+|(?:[+\-]?\d*)?n\s*(?:[+\-]\s*\d+)?))\s*\))?/, + POS: /:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/, + PSEUDO: /:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/ + }, + + leftMatch: {}, + + attrMap: { + "class": "className", + "for": "htmlFor" + }, + + attrHandle: { + href: function( elem ) { + return elem.getAttribute( "href" ); + }, + type: function( elem ) { + return elem.getAttribute( "type" ); + } + }, + + relative: { + "+": function(checkSet, part){ + var isPartStr = typeof part === "string", + isTag = isPartStr && !rNonWord.test( part ), + isPartStrNotTag = isPartStr && !isTag; + + if ( isTag ) { + part = part.toLowerCase(); + } + + for ( var i = 0, l = checkSet.length, elem; i < l; i++ ) { + if ( (elem = checkSet[i]) ) { + while ( (elem = elem.previousSibling) && elem.nodeType !== 1 ) {} + + checkSet[i] = isPartStrNotTag || elem && elem.nodeName.toLowerCase() === part ? + elem || false : + elem === part; + } + } + + if ( isPartStrNotTag ) { + Sizzle.filter( part, checkSet, true ); + } + }, + + ">": function( checkSet, part ) { + var elem, + isPartStr = typeof part === "string", + i = 0, + l = checkSet.length; + + if ( isPartStr && !rNonWord.test( part ) ) { + part = part.toLowerCase(); + + for ( ; i < l; i++ ) { + elem = checkSet[i]; + + if ( elem ) { + var parent = elem.parentNode; + checkSet[i] = parent.nodeName.toLowerCase() === part ? parent : false; + } + } + + } else { + for ( ; i < l; i++ ) { + elem = checkSet[i]; + + if ( elem ) { + checkSet[i] = isPartStr ? + elem.parentNode : + elem.parentNode === part; + } + } + + if ( isPartStr ) { + Sizzle.filter( part, checkSet, true ); + } + } + }, + + "": function(checkSet, part, isXML){ + var nodeCheck, + doneName = done++, + checkFn = dirCheck; + + if ( typeof part === "string" && !rNonWord.test( part ) ) { + part = part.toLowerCase(); + nodeCheck = part; + checkFn = dirNodeCheck; + } + + checkFn( "parentNode", part, doneName, checkSet, nodeCheck, isXML ); + }, + + "~": function( checkSet, part, isXML ) { + var nodeCheck, + doneName = done++, + checkFn = dirCheck; + + if ( typeof part === "string" && !rNonWord.test( part ) ) { + part = part.toLowerCase(); + nodeCheck = part; + checkFn = dirNodeCheck; + } + + checkFn( "previousSibling", part, doneName, checkSet, nodeCheck, isXML ); + } + }, + + find: { + ID: function( match, context, isXML ) { + if ( typeof context.getElementById !== "undefined" && !isXML ) { + var m = context.getElementById(match[1]); + // Check parentNode to catch when Blackberry 4.6 returns + // nodes that are no longer in the document #6963 + return m && m.parentNode ? [m] : []; + } + }, + + NAME: function( match, context ) { + if ( typeof context.getElementsByName !== "undefined" ) { + var ret = [], + results = context.getElementsByName( match[1] ); + + for ( var i = 0, l = results.length; i < l; i++ ) { + if ( results[i].getAttribute("name") === match[1] ) { + ret.push( results[i] ); + } + } + + return ret.length === 0 ? null : ret; + } + }, + + TAG: function( match, context ) { + if ( typeof context.getElementsByTagName !== "undefined" ) { + return context.getElementsByTagName( match[1] ); + } + } + }, + preFilter: { + CLASS: function( match, curLoop, inplace, result, not, isXML ) { + match = " " + match[1].replace( rBackslash, "" ) + " "; + + if ( isXML ) { + return match; + } + + for ( var i = 0, elem; (elem = curLoop[i]) != null; i++ ) { + if ( elem ) { + if ( not ^ (elem.className && (" " + elem.className + " ").replace(/[\t\n\r]/g, " ").indexOf(match) >= 0) ) { + if ( !inplace ) { + result.push( elem ); + } + + } else if ( inplace ) { + curLoop[i] = false; + } + } + } + + return false; + }, + + ID: function( match ) { + return match[1].replace( rBackslash, "" ); + }, + + TAG: function( match, curLoop ) { + return match[1].replace( rBackslash, "" ).toLowerCase(); + }, + + CHILD: function( match ) { + if ( match[1] === "nth" ) { + if ( !match[2] ) { + Sizzle.error( match[0] ); + } + + match[2] = match[2].replace(/^\+|\s*/g, ''); + + // parse equations like 'even', 'odd', '5', '2n', '3n+2', '4n-1', '-n+6' + var test = /(-?)(\d*)(?:n([+\-]?\d*))?/.exec( + match[2] === "even" && "2n" || match[2] === "odd" && "2n+1" || + !/\D/.test( match[2] ) && "0n+" + match[2] || match[2]); + + // calculate the numbers (first)n+(last) including if they are negative + match[2] = (test[1] + (test[2] || 1)) - 0; + match[3] = test[3] - 0; + } + else if ( match[2] ) { + Sizzle.error( match[0] ); + } + + // TODO: Move to normal caching system + match[0] = done++; + + return match; + }, + + ATTR: function( match, curLoop, inplace, result, not, isXML ) { + var name = match[1] = match[1].replace( rBackslash, "" ); + + if ( !isXML && Expr.attrMap[name] ) { + match[1] = Expr.attrMap[name]; + } + + // Handle if an un-quoted value was used + match[4] = ( match[4] || match[5] || "" ).replace( rBackslash, "" ); + + if ( match[2] === "~=" ) { + match[4] = " " + match[4] + " "; + } + + return match; + }, + + PSEUDO: function( match, curLoop, inplace, result, not ) { + if ( match[1] === "not" ) { + // If we're dealing with a complex expression, or a simple one + if ( ( chunker.exec(match[3]) || "" ).length > 1 || /^\w/.test(match[3]) ) { + match[3] = Sizzle(match[3], null, null, curLoop); + + } else { + var ret = Sizzle.filter(match[3], curLoop, inplace, true ^ not); + + if ( !inplace ) { + result.push.apply( result, ret ); + } + + return false; + } + + } else if ( Expr.match.POS.test( match[0] ) || Expr.match.CHILD.test( match[0] ) ) { + return true; + } + + return match; + }, + + POS: function( match ) { + match.unshift( true ); + + return match; + } + }, + + filters: { + enabled: function( elem ) { + return elem.disabled === false && elem.type !== "hidden"; + }, + + disabled: function( elem ) { + return elem.disabled === true; + }, + + checked: function( elem ) { + return elem.checked === true; + }, + + selected: function( elem ) { + // Accessing this property makes selected-by-default + // options in Safari work properly + if ( elem.parentNode ) { + elem.parentNode.selectedIndex; + } + + return elem.selected === true; + }, + + parent: function( elem ) { + return !!elem.firstChild; + }, + + empty: function( elem ) { + return !elem.firstChild; + }, + + has: function( elem, i, match ) { + return !!Sizzle( match[3], elem ).length; + }, + + header: function( elem ) { + return (/h\d/i).test( elem.nodeName ); + }, + + text: function( elem ) { + var attr = elem.getAttribute( "type" ), type = elem.type; + // IE6 and 7 will map elem.type to 'text' for new HTML5 types (search, etc) + // use getAttribute instead to test this case + return elem.nodeName.toLowerCase() === "input" && "text" === type && ( attr === type || attr === null ); + }, + + radio: function( elem ) { + return elem.nodeName.toLowerCase() === "input" && "radio" === elem.type; + }, + + checkbox: function( elem ) { + return elem.nodeName.toLowerCase() === "input" && "checkbox" === elem.type; + }, + + file: function( elem ) { + return elem.nodeName.toLowerCase() === "input" && "file" === elem.type; + }, + + password: function( elem ) { + return elem.nodeName.toLowerCase() === "input" && "password" === elem.type; + }, + + submit: function( elem ) { + var name = elem.nodeName.toLowerCase(); + return (name === "input" || name === "button") && "submit" === elem.type; + }, + + image: function( elem ) { + return elem.nodeName.toLowerCase() === "input" && "image" === elem.type; + }, + + reset: function( elem ) { + var name = elem.nodeName.toLowerCase(); + return (name === "input" || name === "button") && "reset" === elem.type; + }, + + button: function( elem ) { + var name = elem.nodeName.toLowerCase(); + return name === "input" && "button" === elem.type || name === "button"; + }, + + input: function( elem ) { + return (/input|select|textarea|button/i).test( elem.nodeName ); + }, + + focus: function( elem ) { + return elem === elem.ownerDocument.activeElement; + } + }, + setFilters: { + first: function( elem, i ) { + return i === 0; + }, + + last: function( elem, i, match, array ) { + return i === array.length - 1; + }, + + even: function( elem, i ) { + return i % 2 === 0; + }, + + odd: function( elem, i ) { + return i % 2 === 1; + }, + + lt: function( elem, i, match ) { + return i < match[3] - 0; + }, + + gt: function( elem, i, match ) { + return i > match[3] - 0; + }, + + nth: function( elem, i, match ) { + return match[3] - 0 === i; + }, + + eq: function( elem, i, match ) { + return match[3] - 0 === i; + } + }, + filter: { + PSEUDO: function( elem, match, i, array ) { + var name = match[1], + filter = Expr.filters[ name ]; + + if ( filter ) { + return filter( elem, i, match, array ); + + } else if ( name === "contains" ) { + return (elem.textContent || elem.innerText || getText([ elem ]) || "").indexOf(match[3]) >= 0; + + } else if ( name === "not" ) { + var not = match[3]; + + for ( var j = 0, l = not.length; j < l; j++ ) { + if ( not[j] === elem ) { + return false; + } + } + + return true; + + } else { + Sizzle.error( name ); + } + }, + + CHILD: function( elem, match ) { + var first, last, + doneName, parent, cache, + count, diff, + type = match[1], + node = elem; + + switch ( type ) { + case "only": + case "first": + while ( (node = node.previousSibling) ) { + if ( node.nodeType === 1 ) { + return false; + } + } + + if ( type === "first" ) { + return true; + } + + node = elem; + + case "last": + while ( (node = node.nextSibling) ) { + if ( node.nodeType === 1 ) { + return false; + } + } + + return true; + + case "nth": + first = match[2]; + last = match[3]; + + if ( first === 1 && last === 0 ) { + return true; + } + + doneName = match[0]; + parent = elem.parentNode; + + if ( parent && (parent[ expando ] !== doneName || !elem.nodeIndex) ) { + count = 0; + + for ( node = parent.firstChild; node; node = node.nextSibling ) { + if ( node.nodeType === 1 ) { + node.nodeIndex = ++count; + } + } + + parent[ expando ] = doneName; + } + + diff = elem.nodeIndex - last; + + if ( first === 0 ) { + return diff === 0; + + } else { + return ( diff % first === 0 && diff / first >= 0 ); + } + } + }, + + ID: function( elem, match ) { + return elem.nodeType === 1 && elem.getAttribute("id") === match; + }, + + TAG: function( elem, match ) { + return (match === "*" && elem.nodeType === 1) || !!elem.nodeName && elem.nodeName.toLowerCase() === match; + }, + + CLASS: function( elem, match ) { + return (" " + (elem.className || elem.getAttribute("class")) + " ") + .indexOf( match ) > -1; + }, + + ATTR: function( elem, match ) { + var name = match[1], + result = Sizzle.attr ? + Sizzle.attr( elem, name ) : + Expr.attrHandle[ name ] ? + Expr.attrHandle[ name ]( elem ) : + elem[ name ] != null ? + elem[ name ] : + elem.getAttribute( name ), + value = result + "", + type = match[2], + check = match[4]; + + return result == null ? + type === "!=" : + !type && Sizzle.attr ? + result != null : + type === "=" ? + value === check : + type === "*=" ? + value.indexOf(check) >= 0 : + type === "~=" ? + (" " + value + " ").indexOf(check) >= 0 : + !check ? + value && result !== false : + type === "!=" ? + value !== check : + type === "^=" ? + value.indexOf(check) === 0 : + type === "$=" ? + value.substr(value.length - check.length) === check : + type === "|=" ? + value === check || value.substr(0, check.length + 1) === check + "-" : + false; + }, + + POS: function( elem, match, i, array ) { + var name = match[2], + filter = Expr.setFilters[ name ]; + + if ( filter ) { + return filter( elem, i, match, array ); + } + } + } +}; + +var origPOS = Expr.match.POS, + fescape = function(all, num){ + return "\\" + (num - 0 + 1); + }; + +for ( var type in Expr.match ) { + Expr.match[ type ] = new RegExp( Expr.match[ type ].source + (/(?![^\[]*\])(?![^\(]*\))/.source) ); + Expr.leftMatch[ type ] = new RegExp( /(^(?:.|\r|\n)*?)/.source + Expr.match[ type ].source.replace(/\\(\d+)/g, fescape) ); +} + +var makeArray = function( array, results ) { + array = Array.prototype.slice.call( array, 0 ); + + if ( results ) { + results.push.apply( results, array ); + return results; + } + + return array; +}; + +// Perform a simple check to determine if the browser is capable of +// converting a NodeList to an array using builtin methods. +// Also verifies that the returned array holds DOM nodes +// (which is not the case in the Blackberry browser) +try { + Array.prototype.slice.call( document.documentElement.childNodes, 0 )[0].nodeType; + +// Provide a fallback method if it does not work +} catch( e ) { + makeArray = function( array, results ) { + var i = 0, + ret = results || []; + + if ( toString.call(array) === "[object Array]" ) { + Array.prototype.push.apply( ret, array ); + + } else { + if ( typeof array.length === "number" ) { + for ( var l = array.length; i < l; i++ ) { + ret.push( array[i] ); + } + + } else { + for ( ; array[i]; i++ ) { + ret.push( array[i] ); + } + } + } + + return ret; + }; +} + +var sortOrder, siblingCheck; + +if ( document.documentElement.compareDocumentPosition ) { + sortOrder = function( a, b ) { + if ( a === b ) { + hasDuplicate = true; + return 0; + } + + if ( !a.compareDocumentPosition || !b.compareDocumentPosition ) { + return a.compareDocumentPosition ? -1 : 1; + } + + return a.compareDocumentPosition(b) & 4 ? -1 : 1; + }; + +} else { + sortOrder = function( a, b ) { + // The nodes are identical, we can exit early + if ( a === b ) { + hasDuplicate = true; + return 0; + + // Fallback to using sourceIndex (in IE) if it's available on both nodes + } else if ( a.sourceIndex && b.sourceIndex ) { + return a.sourceIndex - b.sourceIndex; + } + + var al, bl, + ap = [], + bp = [], + aup = a.parentNode, + bup = b.parentNode, + cur = aup; + + // If the nodes are siblings (or identical) we can do a quick check + if ( aup === bup ) { + return siblingCheck( a, b ); + + // If no parents were found then the nodes are disconnected + } else if ( !aup ) { + return -1; + + } else if ( !bup ) { + return 1; + } + + // Otherwise they're somewhere else in the tree so we need + // to build up a full list of the parentNodes for comparison + while ( cur ) { + ap.unshift( cur ); + cur = cur.parentNode; + } + + cur = bup; + + while ( cur ) { + bp.unshift( cur ); + cur = cur.parentNode; + } + + al = ap.length; + bl = bp.length; + + // Start walking down the tree looking for a discrepancy + for ( var i = 0; i < al && i < bl; i++ ) { + if ( ap[i] !== bp[i] ) { + return siblingCheck( ap[i], bp[i] ); + } + } + + // We ended someplace up the tree so do a sibling check + return i === al ? + siblingCheck( a, bp[i], -1 ) : + siblingCheck( ap[i], b, 1 ); + }; + + siblingCheck = function( a, b, ret ) { + if ( a === b ) { + return ret; + } + + var cur = a.nextSibling; + + while ( cur ) { + if ( cur === b ) { + return -1; + } + + cur = cur.nextSibling; + } + + return 1; + }; +} + +// Check to see if the browser returns elements by name when +// querying by getElementById (and provide a workaround) +(function(){ + // We're going to inject a fake input element with a specified name + var form = document.createElement("div"), + id = "script" + (new Date()).getTime(), + root = document.documentElement; + + form.innerHTML = ""; + + // Inject it into the root element, check its status, and remove it quickly + root.insertBefore( form, root.firstChild ); + + // The workaround has to do additional checks after a getElementById + // Which slows things down for other browsers (hence the branching) + if ( document.getElementById( id ) ) { + Expr.find.ID = function( match, context, isXML ) { + if ( typeof context.getElementById !== "undefined" && !isXML ) { + var m = context.getElementById(match[1]); + + return m ? + m.id === match[1] || typeof m.getAttributeNode !== "undefined" && m.getAttributeNode("id").nodeValue === match[1] ? + [m] : + undefined : + []; + } + }; + + Expr.filter.ID = function( elem, match ) { + var node = typeof elem.getAttributeNode !== "undefined" && elem.getAttributeNode("id"); + + return elem.nodeType === 1 && node && node.nodeValue === match; + }; + } + + root.removeChild( form ); + + // release memory in IE + root = form = null; +})(); + +(function(){ + // Check to see if the browser returns only elements + // when doing getElementsByTagName("*") + + // Create a fake element + var div = document.createElement("div"); + div.appendChild( document.createComment("") ); + + // Make sure no comments are found + if ( div.getElementsByTagName("*").length > 0 ) { + Expr.find.TAG = function( match, context ) { + var results = context.getElementsByTagName( match[1] ); + + // Filter out possible comments + if ( match[1] === "*" ) { + var tmp = []; + + for ( var i = 0; results[i]; i++ ) { + if ( results[i].nodeType === 1 ) { + tmp.push( results[i] ); + } + } + + results = tmp; + } + + return results; + }; + } + + // Check to see if an attribute returns normalized href attributes + div.innerHTML = ""; + + if ( div.firstChild && typeof div.firstChild.getAttribute !== "undefined" && + div.firstChild.getAttribute("href") !== "#" ) { + + Expr.attrHandle.href = function( elem ) { + return elem.getAttribute( "href", 2 ); + }; + } + + // release memory in IE + div = null; +})(); + +if ( document.querySelectorAll ) { + (function(){ + var oldSizzle = Sizzle, + div = document.createElement("div"), + id = "__sizzle__"; + + div.innerHTML = "

"; + + // Safari can't handle uppercase or unicode characters when + // in quirks mode. + if ( div.querySelectorAll && div.querySelectorAll(".TEST").length === 0 ) { + return; + } + + Sizzle = function( query, context, extra, seed ) { + context = context || document; + + // Only use querySelectorAll on non-XML documents + // (ID selectors don't work in non-HTML documents) + if ( !seed && !Sizzle.isXML(context) ) { + // See if we find a selector to speed up + var match = /^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec( query ); + + if ( match && (context.nodeType === 1 || context.nodeType === 9) ) { + // Speed-up: Sizzle("TAG") + if ( match[1] ) { + return makeArray( context.getElementsByTagName( query ), extra ); + + // Speed-up: Sizzle(".CLASS") + } else if ( match[2] && Expr.find.CLASS && context.getElementsByClassName ) { + return makeArray( context.getElementsByClassName( match[2] ), extra ); + } + } + + if ( context.nodeType === 9 ) { + // Speed-up: Sizzle("body") + // The body element only exists once, optimize finding it + if ( query === "body" && context.body ) { + return makeArray( [ context.body ], extra ); + + // Speed-up: Sizzle("#ID") + } else if ( match && match[3] ) { + var elem = context.getElementById( match[3] ); + + // Check parentNode to catch when Blackberry 4.6 returns + // nodes that are no longer in the document #6963 + if ( elem && elem.parentNode ) { + // Handle the case where IE and Opera return items + // by name instead of ID + if ( elem.id === match[3] ) { + return makeArray( [ elem ], extra ); + } + + } else { + return makeArray( [], extra ); + } + } + + try { + return makeArray( context.querySelectorAll(query), extra ); + } catch(qsaError) {} + + // qSA works strangely on Element-rooted queries + // We can work around this by specifying an extra ID on the root + // and working up from there (Thanks to Andrew Dupont for the technique) + // IE 8 doesn't work on object elements + } else if ( context.nodeType === 1 && context.nodeName.toLowerCase() !== "object" ) { + var oldContext = context, + old = context.getAttribute( "id" ), + nid = old || id, + hasParent = context.parentNode, + relativeHierarchySelector = /^\s*[+~]/.test( query ); + + if ( !old ) { + context.setAttribute( "id", nid ); + } else { + nid = nid.replace( /'/g, "\\$&" ); + } + if ( relativeHierarchySelector && hasParent ) { + context = context.parentNode; + } + + try { + if ( !relativeHierarchySelector || hasParent ) { + return makeArray( context.querySelectorAll( "[id='" + nid + "'] " + query ), extra ); + } + + } catch(pseudoError) { + } finally { + if ( !old ) { + oldContext.removeAttribute( "id" ); + } + } + } + } + + return oldSizzle(query, context, extra, seed); + }; + + for ( var prop in oldSizzle ) { + Sizzle[ prop ] = oldSizzle[ prop ]; + } + + // release memory in IE + div = null; + })(); +} + +(function(){ + var html = document.documentElement, + matches = html.matchesSelector || html.mozMatchesSelector || html.webkitMatchesSelector || html.msMatchesSelector; + + if ( matches ) { + // Check to see if it's possible to do matchesSelector + // on a disconnected node (IE 9 fails this) + var disconnectedMatch = !matches.call( document.createElement( "div" ), "div" ), + pseudoWorks = false; + + try { + // This should fail with an exception + // Gecko does not error, returns false instead + matches.call( document.documentElement, "[test!='']:sizzle" ); + + } catch( pseudoError ) { + pseudoWorks = true; + } + + Sizzle.matchesSelector = function( node, expr ) { + // Make sure that attribute selectors are quoted + expr = expr.replace(/\=\s*([^'"\]]*)\s*\]/g, "='$1']"); + + if ( !Sizzle.isXML( node ) ) { + try { + if ( pseudoWorks || !Expr.match.PSEUDO.test( expr ) && !/!=/.test( expr ) ) { + var ret = matches.call( node, expr ); + + // IE 9's matchesSelector returns false on disconnected nodes + if ( ret || !disconnectedMatch || + // As well, disconnected nodes are said to be in a document + // fragment in IE 9, so check for that + node.document && node.document.nodeType !== 11 ) { + return ret; + } + } + } catch(e) {} + } + + return Sizzle(expr, null, null, [node]).length > 0; + }; + } +})(); + +(function(){ + var div = document.createElement("div"); + + div.innerHTML = "
"; + + // Opera can't find a second classname (in 9.6) + // Also, make sure that getElementsByClassName actually exists + if ( !div.getElementsByClassName || div.getElementsByClassName("e").length === 0 ) { + return; + } + + // Safari caches class attributes, doesn't catch changes (in 3.2) + div.lastChild.className = "e"; + + if ( div.getElementsByClassName("e").length === 1 ) { + return; + } + + Expr.order.splice(1, 0, "CLASS"); + Expr.find.CLASS = function( match, context, isXML ) { + if ( typeof context.getElementsByClassName !== "undefined" && !isXML ) { + return context.getElementsByClassName(match[1]); + } + }; + + // release memory in IE + div = null; +})(); + +function dirNodeCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) { + for ( var i = 0, l = checkSet.length; i < l; i++ ) { + var elem = checkSet[i]; + + if ( elem ) { + var match = false; + + elem = elem[dir]; + + while ( elem ) { + if ( elem[ expando ] === doneName ) { + match = checkSet[elem.sizset]; + break; + } + + if ( elem.nodeType === 1 && !isXML ){ + elem[ expando ] = doneName; + elem.sizset = i; + } + + if ( elem.nodeName.toLowerCase() === cur ) { + match = elem; + break; + } + + elem = elem[dir]; + } + + checkSet[i] = match; + } + } +} + +function dirCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) { + for ( var i = 0, l = checkSet.length; i < l; i++ ) { + var elem = checkSet[i]; + + if ( elem ) { + var match = false; + + elem = elem[dir]; + + while ( elem ) { + if ( elem[ expando ] === doneName ) { + match = checkSet[elem.sizset]; + break; + } + + if ( elem.nodeType === 1 ) { + if ( !isXML ) { + elem[ expando ] = doneName; + elem.sizset = i; + } + + if ( typeof cur !== "string" ) { + if ( elem === cur ) { + match = true; + break; + } + + } else if ( Sizzle.filter( cur, [elem] ).length > 0 ) { + match = elem; + break; + } + } + + elem = elem[dir]; + } + + checkSet[i] = match; + } + } +} + +if ( document.documentElement.contains ) { + Sizzle.contains = function( a, b ) { + return a !== b && (a.contains ? a.contains(b) : true); + }; + +} else if ( document.documentElement.compareDocumentPosition ) { + Sizzle.contains = function( a, b ) { + return !!(a.compareDocumentPosition(b) & 16); + }; + +} else { + Sizzle.contains = function() { + return false; + }; +} + +Sizzle.isXML = function( elem ) { + // documentElement is verified for cases where it doesn't yet exist + // (such as loading iframes in IE - #4833) + var documentElement = (elem ? elem.ownerDocument || elem : 0).documentElement; + + return documentElement ? documentElement.nodeName !== "HTML" : false; +}; + +var posProcess = function( selector, context, seed ) { + var match, + tmpSet = [], + later = "", + root = context.nodeType ? [context] : context; + + // Position selectors must be done after the filter + // And so must :not(positional) so we move all PSEUDOs to the end + while ( (match = Expr.match.PSEUDO.exec( selector )) ) { + later += match[0]; + selector = selector.replace( Expr.match.PSEUDO, "" ); + } + + selector = Expr.relative[selector] ? selector + "*" : selector; + + for ( var i = 0, l = root.length; i < l; i++ ) { + Sizzle( selector, root[i], tmpSet, seed ); + } + + return Sizzle.filter( later, tmpSet ); +}; + +// EXPOSE +// Override sizzle attribute retrieval +Sizzle.attr = jQuery.attr; +Sizzle.selectors.attrMap = {}; +jQuery.find = Sizzle; +jQuery.expr = Sizzle.selectors; +jQuery.expr[":"] = jQuery.expr.filters; +jQuery.unique = Sizzle.uniqueSort; +jQuery.text = Sizzle.getText; +jQuery.isXMLDoc = Sizzle.isXML; +jQuery.contains = Sizzle.contains; + + +})(); + + +var runtil = /Until$/, + rparentsprev = /^(?:parents|prevUntil|prevAll)/, + // Note: This RegExp should be improved, or likely pulled from Sizzle + rmultiselector = /,/, + isSimple = /^.[^:#\[\.,]*$/, + slice = Array.prototype.slice, + POS = jQuery.expr.match.POS, + // methods guaranteed to produce a unique set when starting from a unique set + guaranteedUnique = { + children: true, + contents: true, + next: true, + prev: true + }; + +jQuery.fn.extend({ + find: function( selector ) { + var self = this, + i, l; + + if ( typeof selector !== "string" ) { + return jQuery( selector ).filter(function() { + for ( i = 0, l = self.length; i < l; i++ ) { + if ( jQuery.contains( self[ i ], this ) ) { + return true; + } + } + }); + } + + var ret = this.pushStack( "", "find", selector ), + length, n, r; + + for ( i = 0, l = this.length; i < l; i++ ) { + length = ret.length; + jQuery.find( selector, this[i], ret ); + + if ( i > 0 ) { + // Make sure that the results are unique + for ( n = length; n < ret.length; n++ ) { + for ( r = 0; r < length; r++ ) { + if ( ret[r] === ret[n] ) { + ret.splice(n--, 1); + break; + } + } + } + } + } + + return ret; + }, + + has: function( target ) { + var targets = jQuery( target ); + return this.filter(function() { + for ( var i = 0, l = targets.length; i < l; i++ ) { + if ( jQuery.contains( this, targets[i] ) ) { + return true; + } + } + }); + }, + + not: function( selector ) { + return this.pushStack( winnow(this, selector, false), "not", selector); + }, + + filter: function( selector ) { + return this.pushStack( winnow(this, selector, true), "filter", selector ); + }, + + is: function( selector ) { + return !!selector && ( + typeof selector === "string" ? + // If this is a positional selector, check membership in the returned set + // so $("p:first").is("p:last") won't return true for a doc with two "p". + POS.test( selector ) ? + jQuery( selector, this.context ).index( this[0] ) >= 0 : + jQuery.filter( selector, this ).length > 0 : + this.filter( selector ).length > 0 ); + }, + + closest: function( selectors, context ) { + var ret = [], i, l, cur = this[0]; + + // Array (deprecated as of jQuery 1.7) + if ( jQuery.isArray( selectors ) ) { + var level = 1; + + while ( cur && cur.ownerDocument && cur !== context ) { + for ( i = 0; i < selectors.length; i++ ) { + + if ( jQuery( cur ).is( selectors[ i ] ) ) { + ret.push({ selector: selectors[ i ], elem: cur, level: level }); + } + } + + cur = cur.parentNode; + level++; + } + + return ret; + } + + // String + var pos = POS.test( selectors ) || typeof selectors !== "string" ? + jQuery( selectors, context || this.context ) : + 0; + + for ( i = 0, l = this.length; i < l; i++ ) { + cur = this[i]; + + while ( cur ) { + if ( pos ? pos.index(cur) > -1 : jQuery.find.matchesSelector(cur, selectors) ) { + ret.push( cur ); + break; + + } else { + cur = cur.parentNode; + if ( !cur || !cur.ownerDocument || cur === context || cur.nodeType === 11 ) { + break; + } + } + } + } + + ret = ret.length > 1 ? jQuery.unique( ret ) : ret; + + return this.pushStack( ret, "closest", selectors ); + }, + + // Determine the position of an element within + // the matched set of elements + index: function( elem ) { + + // No argument, return index in parent + if ( !elem ) { + return ( this[0] && this[0].parentNode ) ? this.prevAll().length : -1; + } + + // index in selector + if ( typeof elem === "string" ) { + return jQuery.inArray( this[0], jQuery( elem ) ); + } + + // Locate the position of the desired element + return jQuery.inArray( + // If it receives a jQuery object, the first element is used + elem.jquery ? elem[0] : elem, this ); + }, + + add: function( selector, context ) { + var set = typeof selector === "string" ? + jQuery( selector, context ) : + jQuery.makeArray( selector && selector.nodeType ? [ selector ] : selector ), + all = jQuery.merge( this.get(), set ); + + return this.pushStack( isDisconnected( set[0] ) || isDisconnected( all[0] ) ? + all : + jQuery.unique( all ) ); + }, + + andSelf: function() { + return this.add( this.prevObject ); + } +}); + +// A painfully simple check to see if an element is disconnected +// from a document (should be improved, where feasible). +function isDisconnected( node ) { + return !node || !node.parentNode || node.parentNode.nodeType === 11; +} + +jQuery.each({ + parent: function( elem ) { + var parent = elem.parentNode; + return parent && parent.nodeType !== 11 ? parent : null; + }, + parents: function( elem ) { + return jQuery.dir( elem, "parentNode" ); + }, + parentsUntil: function( elem, i, until ) { + return jQuery.dir( elem, "parentNode", until ); + }, + next: function( elem ) { + return jQuery.nth( elem, 2, "nextSibling" ); + }, + prev: function( elem ) { + return jQuery.nth( elem, 2, "previousSibling" ); + }, + nextAll: function( elem ) { + return jQuery.dir( elem, "nextSibling" ); + }, + prevAll: function( elem ) { + return jQuery.dir( elem, "previousSibling" ); + }, + nextUntil: function( elem, i, until ) { + return jQuery.dir( elem, "nextSibling", until ); + }, + prevUntil: function( elem, i, until ) { + return jQuery.dir( elem, "previousSibling", until ); + }, + siblings: function( elem ) { + return jQuery.sibling( elem.parentNode.firstChild, elem ); + }, + children: function( elem ) { + return jQuery.sibling( elem.firstChild ); + }, + contents: function( elem ) { + return jQuery.nodeName( elem, "iframe" ) ? + elem.contentDocument || elem.contentWindow.document : + jQuery.makeArray( elem.childNodes ); + } +}, function( name, fn ) { + jQuery.fn[ name ] = function( until, selector ) { + var ret = jQuery.map( this, fn, until ); + + if ( !runtil.test( name ) ) { + selector = until; + } + + if ( selector && typeof selector === "string" ) { + ret = jQuery.filter( selector, ret ); + } + + ret = this.length > 1 && !guaranteedUnique[ name ] ? jQuery.unique( ret ) : ret; + + if ( (this.length > 1 || rmultiselector.test( selector )) && rparentsprev.test( name ) ) { + ret = ret.reverse(); + } + + return this.pushStack( ret, name, slice.call( arguments ).join(",") ); + }; +}); + +jQuery.extend({ + filter: function( expr, elems, not ) { + if ( not ) { + expr = ":not(" + expr + ")"; + } + + return elems.length === 1 ? + jQuery.find.matchesSelector(elems[0], expr) ? [ elems[0] ] : [] : + jQuery.find.matches(expr, elems); + }, + + dir: function( elem, dir, until ) { + var matched = [], + cur = elem[ dir ]; + + while ( cur && cur.nodeType !== 9 && (until === undefined || cur.nodeType !== 1 || !jQuery( cur ).is( until )) ) { + if ( cur.nodeType === 1 ) { + matched.push( cur ); + } + cur = cur[dir]; + } + return matched; + }, + + nth: function( cur, result, dir, elem ) { + result = result || 1; + var num = 0; + + for ( ; cur; cur = cur[dir] ) { + if ( cur.nodeType === 1 && ++num === result ) { + break; + } + } + + return cur; + }, + + sibling: function( n, elem ) { + var r = []; + + for ( ; n; n = n.nextSibling ) { + if ( n.nodeType === 1 && n !== elem ) { + r.push( n ); + } + } + + return r; + } +}); + +// Implement the identical functionality for filter and not +function winnow( elements, qualifier, keep ) { + + // Can't pass null or undefined to indexOf in Firefox 4 + // Set to 0 to skip string check + qualifier = qualifier || 0; + + if ( jQuery.isFunction( qualifier ) ) { + return jQuery.grep(elements, function( elem, i ) { + var retVal = !!qualifier.call( elem, i, elem ); + return retVal === keep; + }); + + } else if ( qualifier.nodeType ) { + return jQuery.grep(elements, function( elem, i ) { + return ( elem === qualifier ) === keep; + }); + + } else if ( typeof qualifier === "string" ) { + var filtered = jQuery.grep(elements, function( elem ) { + return elem.nodeType === 1; + }); + + if ( isSimple.test( qualifier ) ) { + return jQuery.filter(qualifier, filtered, !keep); + } else { + qualifier = jQuery.filter( qualifier, filtered ); + } + } + + return jQuery.grep(elements, function( elem, i ) { + return ( jQuery.inArray( elem, qualifier ) >= 0 ) === keep; + }); +} + + + + +function createSafeFragment( document ) { + var list = nodeNames.split( "|" ), + safeFrag = document.createDocumentFragment(); + + if ( safeFrag.createElement ) { + while ( list.length ) { + safeFrag.createElement( + list.pop() + ); + } + } + return safeFrag; +} + +var nodeNames = "abbr|article|aside|audio|canvas|datalist|details|figcaption|figure|footer|" + + "header|hgroup|mark|meter|nav|output|progress|section|summary|time|video", + rinlinejQuery = / jQuery\d+="(?:\d+|null)"/g, + rleadingWhitespace = /^\s+/, + rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig, + rtagName = /<([\w:]+)/, + rtbody = /", "" ], + legend: [ 1, "
", "
" ], + thead: [ 1, "", "
" ], + tr: [ 2, "", "
" ], + td: [ 3, "", "
" ], + col: [ 2, "", "
" ], + area: [ 1, "", "" ], + _default: [ 0, "", "" ] + }, + safeFragment = createSafeFragment( document ); + +wrapMap.optgroup = wrapMap.option; +wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead; +wrapMap.th = wrapMap.td; + +// IE can't serialize and \ '); diff --git a/src/static/js/ace2_common.js b/src/static/js/ace2_common.js index b4c72a92..7f79f1c0 100644 --- a/src/static/js/ace2_common.js +++ b/src/static/js/ace2_common.js @@ -20,7 +20,7 @@ * limitations under the License. */ -var Security = require('/security'); +var Security = require('ep_etherpad-lite/static/js/security'); function isNodeText(node) { diff --git a/src/static/js/ace2_inner.js b/src/static/js/ace2_inner.js index d2113574..67535d86 100644 --- a/src/static/js/ace2_inner.js +++ b/src/static/js/ace2_inner.js @@ -20,7 +20,7 @@ * limitations under the License. */ -var Ace2Common = require('/ace2_common'); +var Ace2Common = require('ep_etherpad-lite/static/js/ace2_common'); // Extract useful method defined in the other module. var isNodeText = Ace2Common.isNodeText; var object = Ace2Common.object; @@ -37,17 +37,17 @@ var binarySearchInfinite = Ace2Common.binarySearchInfinite; var htmlPrettyEscape = Ace2Common.htmlPrettyEscape; var map = Ace2Common.map; -var makeChangesetTracker = require('/changesettracker').makeChangesetTracker; -var colorutils = require('/colorutils').colorutils; -var makeContentCollector = require('/contentcollector').makeContentCollector; -var makeCSSManager = require('/cssmanager').makeCSSManager; -var domline = require('/domline').domline; -var AttribPool = require('/AttributePoolFactory').createAttributePool; -var Changeset = require('/Changeset'); -var linestylefilter = require('/linestylefilter').linestylefilter; -var newSkipList = require('/skiplist').newSkipList; -var undoModule = require('/undomodule').undoModule; -var makeVirtualLineView = require('/virtual_lines').makeVirtualLineView; +var makeChangesetTracker = require('ep_etherpad-lite/static/js/changesettracker').makeChangesetTracker; +var colorutils = require('ep_etherpad-lite/static/js/colorutils').colorutils; +var makeContentCollector = require('ep_etherpad-lite/static/js/contentcollector').makeContentCollector; +var makeCSSManager = require('ep_etherpad-lite/static/js/cssmanager').makeCSSManager; +var domline = require('ep_etherpad-lite/static/js/domline').domline; +var AttribPool = require('ep_etherpad-lite/static/js/AttributePoolFactory').createAttributePool; +var Changeset = require('ep_etherpad-lite/static/js/Changeset'); +var linestylefilter = require('ep_etherpad-lite/static/js/linestylefilter').linestylefilter; +var newSkipList = require('ep_etherpad-lite/static/js/skiplist').newSkipList; +var undoModule = require('ep_etherpad-lite/static/js/undomodule').undoModule; +var makeVirtualLineView = require('ep_etherpad-lite/static/js/virtual_lines').makeVirtualLineView; function OUTER(gscope) { diff --git a/src/static/js/broadcast.js b/src/static/js/broadcast.js index 4a7b0168..f0a62701 100644 --- a/src/static/js/broadcast.js +++ b/src/static/js/broadcast.js @@ -20,12 +20,12 @@ * limitations under the License. */ -var makeCSSManager = require('/cssmanager').makeCSSManager; -var domline = require('/domline').domline; -var AttribPool = require('/AttributePoolFactory').createAttributePool; -var Changeset = require('/Changeset'); -var linestylefilter = require('/linestylefilter').linestylefilter; -var colorutils = require('/colorutils').colorutils; +var makeCSSManager = require('ep_etherpad-lite/static/js/cssmanager').makeCSSManager; +var domline = require('ep_etherpad-lite/static/js/domline').domline; +var AttribPool = require('ep_etherpad-lite/static/js/AttributePoolFactory').createAttributePool; +var Changeset = require('ep_etherpad-lite/static/js/Changeset'); +var linestylefilter = require('ep_etherpad-lite/static/js/linestylefilter').linestylefilter; +var colorutils = require('ep_etherpad-lite/static/js/colorutils').colorutils; // These parameters were global, now they are injected. A reference to the // Timeslider controller would probably be more appropriate. diff --git a/src/static/js/changesettracker.js b/src/static/js/changesettracker.js index e34dc107..e5275a69 100644 --- a/src/static/js/changesettracker.js +++ b/src/static/js/changesettracker.js @@ -20,8 +20,8 @@ * limitations under the License. */ -var AttribPool = require('/AttributePoolFactory').createAttributePool; -var Changeset = require('/Changeset'); +var AttribPool = require('ep_etherpad-lite/static/js/AttributePoolFactory').createAttributePool; +var Changeset = require('ep_etherpad-lite/static/js/Changeset'); function makeChangesetTracker(scheduler, apool, aceCallbacksProvider) { diff --git a/src/static/js/chat.js b/src/static/js/chat.js index fb2acac1..943ab09f 100644 --- a/src/static/js/chat.js +++ b/src/static/js/chat.js @@ -20,8 +20,8 @@ * limitations under the License. */ -var padutils = require('/pad_utils').padutils; -var padcookie = require('/pad_cookie').padcookie; +var padutils = require('ep_etherpad-lite/static/js/pad_utils').padutils; +var padcookie = require('ep_etherpad-lite/static/js/pad_cookie').padcookie; var chat = (function() { diff --git a/src/static/js/collab_client.js b/src/static/js/collab_client.js index ec575fe0..384b49d6 100644 --- a/src/static/js/collab_client.js +++ b/src/static/js/collab_client.js @@ -20,7 +20,7 @@ * limitations under the License. */ -var chat = require('/chat').chat; +var chat = require('ep_etherpad-lite/static/js/chat').chat; // Dependency fill on init. This exists for `pad.socket` only. // TODO: bind directly to the socket. diff --git a/src/static/js/contentcollector.js b/src/static/js/contentcollector.js index 96dc4b7d..76b20c92 100644 --- a/src/static/js/contentcollector.js +++ b/src/static/js/contentcollector.js @@ -25,8 +25,8 @@ var _MAX_LIST_LEVEL = 8; -var Changeset = require('/Changeset'); -var plugins = require('/plugins').plugins; +var Changeset = require('ep_etherpad-lite/static/js/Changeset'); +var plugins = require('ep_etherpad-lite/static/js/plugins').plugins; function sanitizeUnicode(s) { diff --git a/src/static/js/domline.js b/src/static/js/domline.js index 15528bf7..71ad2c52 100644 --- a/src/static/js/domline.js +++ b/src/static/js/domline.js @@ -26,9 +26,9 @@ // requires: plugins // requires: undefined -var Security = require('/security'); -var plugins = require('/plugins').plugins; -var map = require('/ace2_common').map; +var Security = require('ep_etherpad-lite/static/js/security'); +var plugins = require('ep_etherpad-lite/static/js/plugins').plugins; +var map = require('ep_etherpad-lite/static/js/ace2_common').map; var domline = {}; domline.noop = function() diff --git a/src/static/js/linestylefilter.js b/src/static/js/linestylefilter.js index 4b455724..b75ac200 100644 --- a/src/static/js/linestylefilter.js +++ b/src/static/js/linestylefilter.js @@ -28,9 +28,9 @@ // requires: plugins // requires: undefined -var Changeset = require('/Changeset'); -var plugins = require('/plugins').plugins; -var map = require('/ace2_common').map; +var Changeset = require('ep_etherpad-lite/static/js/Changeset'); +var plugins = require('ep_etherpad-lite/static/js/plugins').plugins; +var map = require('ep_etherpad-lite/static/js/ace2_common').map; var linestylefilter = {}; diff --git a/src/static/js/pad.js b/src/static/js/pad.js index 537ebed2..06125159 100644 --- a/src/static/js/pad.js +++ b/src/static/js/pad.js @@ -26,29 +26,29 @@ var socket; // These jQuery things should create local references, but for now `require()` // assigns to the global `$` and augments it with plugins. -require('/jquery'); -require('/farbtastic'); -require('/excanvas'); -JSON = require('/json2'); -require('/undo-xpopup'); -require('/prefixfree'); +require('ep_etherpad-lite/static/js/jquery'); +require('ep_etherpad-lite/static/js/farbtastic'); +require('ep_etherpad-lite/static/js/excanvas'); +JSON = require('ep_etherpad-lite/static/js/json2'); +require('ep_etherpad-lite/static/js/undo-xpopup'); +require('ep_etherpad-lite/static/js/prefixfree'); -var chat = require('/chat').chat; -var getCollabClient = require('/collab_client').getCollabClient; -var padconnectionstatus = require('/pad_connectionstatus').padconnectionstatus; -var padcookie = require('/pad_cookie').padcookie; -var paddocbar = require('/pad_docbar').paddocbar; -var padeditbar = require('/pad_editbar').padeditbar; -var padeditor = require('/pad_editor').padeditor; -var padimpexp = require('/pad_impexp').padimpexp; -var padmodals = require('/pad_modals').padmodals; -var padsavedrevs = require('/pad_savedrevs').padsavedrevs; -var paduserlist = require('/pad_userlist').paduserlist; -var padutils = require('/pad_utils').padutils; +var chat = require('ep_etherpad-lite/static/js/chat').chat; +var getCollabClient = require('ep_etherpad-lite/static/js/collab_client').getCollabClient; +var padconnectionstatus = require('ep_etherpad-lite/static/js/pad_connectionstatus').padconnectionstatus; +var padcookie = require('ep_etherpad-lite/static/js/pad_cookie').padcookie; +var paddocbar = require('ep_etherpad-lite/static/js/pad_docbar').paddocbar; +var padeditbar = require('ep_etherpad-lite/static/js/pad_editbar').padeditbar; +var padeditor = require('ep_etherpad-lite/static/js/pad_editor').padeditor; +var padimpexp = require('ep_etherpad-lite/static/js/pad_impexp').padimpexp; +var padmodals = require('ep_etherpad-lite/static/js/pad_modals').padmodals; +var padsavedrevs = require('ep_etherpad-lite/static/js/pad_savedrevs').padsavedrevs; +var paduserlist = require('ep_etherpad-lite/static/js/pad_userlist').paduserlist; +var padutils = require('ep_etherpad-lite/static/js/pad_utils').padutils; -var createCookie = require('/pad_utils').createCookie; -var readCookie = require('/pad_utils').readCookie; -var randomString = require('/pad_utils').randomString; +var createCookie = require('ep_etherpad-lite/static/js/pad_utils').createCookie; +var readCookie = require('ep_etherpad-lite/static/js/pad_utils').readCookie; +var randomString = require('ep_etherpad-lite/static/js/pad_utils').randomString; function getParams() { diff --git a/src/static/js/pad_connectionstatus.js b/src/static/js/pad_connectionstatus.js index 1de024e8..cce92127 100644 --- a/src/static/js/pad_connectionstatus.js +++ b/src/static/js/pad_connectionstatus.js @@ -20,7 +20,7 @@ * limitations under the License. */ -var padmodals = require('/pad_modals').padmodals; +var padmodals = require('ep_etherpad-lite/static/js/pad_modals').padmodals; var padconnectionstatus = (function() { diff --git a/src/static/js/pad_docbar.js b/src/static/js/pad_docbar.js index b83bf3bf..a1f1e9f9 100644 --- a/src/static/js/pad_docbar.js +++ b/src/static/js/pad_docbar.js @@ -20,7 +20,7 @@ * limitations under the License. */ -var padutils = require('/pad_utils').padutils; +var padutils = require('ep_etherpad-lite/static/js/pad_utils').padutils; var paddocbar = (function() { @@ -449,7 +449,7 @@ var paddocbar = (function() handleResizePage: function() { // Side-step circular reference. This should be injected. - var padsavedrevs = require('/pad_savedrevs').padsavedrevs; + var padsavedrevs = require('ep_etherpad-lite/static/js/pad_savedrevs').padsavedrevs; padsavedrevs.handleResizePage(); }, hideLaterIfNoOtherInteraction: function() diff --git a/src/static/js/pad_editbar.js b/src/static/js/pad_editbar.js index 8e4ffa3c..cbaa31d6 100644 --- a/src/static/js/pad_editbar.js +++ b/src/static/js/pad_editbar.js @@ -20,9 +20,9 @@ * limitations under the License. */ -var padutils = require('/pad_utils').padutils; -var padeditor = require('/pad_editor').padeditor; -var padsavedrevs = require('/pad_savedrevs').padsavedrevs; +var padutils = require('ep_etherpad-lite/static/js/pad_utils').padutils; +var padeditor = require('ep_etherpad-lite/static/js/pad_editor').padeditor; +var padsavedrevs = require('ep_etherpad-lite/static/js/pad_savedrevs').padsavedrevs; function indexOf(array, value) { for (var i = 0, ii = array.length; i < ii; i++) { diff --git a/src/static/js/pad_editor.js b/src/static/js/pad_editor.js index e838ae04..c3e65e19 100644 --- a/src/static/js/pad_editor.js +++ b/src/static/js/pad_editor.js @@ -20,8 +20,8 @@ * limitations under the License. */ -var padcookie = require('/pad_cookie').padcookie; -var padutils = require('/pad_utils').padutils; +var padcookie = require('ep_etherpad-lite/static/js/pad_cookie').padcookie; +var padutils = require('ep_etherpad-lite/static/js/pad_utils').padutils; var padeditor = (function() { @@ -34,7 +34,7 @@ var padeditor = (function() viewZoom: 100, init: function(readyFunc, initialViewOptions, _pad) { - Ace2Editor = require('/ace').Ace2Editor; + Ace2Editor = require('ep_etherpad-lite/static/js/ace').Ace2Editor; pad = _pad; settings = pad.settings; diff --git a/src/static/js/pad_impexp.js b/src/static/js/pad_impexp.js index 0037195f..4d6a1dfc 100644 --- a/src/static/js/pad_impexp.js +++ b/src/static/js/pad_impexp.js @@ -20,7 +20,7 @@ * limitations under the License. */ -var paddocbar = require('/pad_docbar').paddocbar; +var paddocbar = require('ep_etherpad-lite/static/js/pad_docbar').paddocbar; var padimpexp = (function() { diff --git a/src/static/js/pad_modals.js b/src/static/js/pad_modals.js index b78e28f4..c19648a6 100644 --- a/src/static/js/pad_modals.js +++ b/src/static/js/pad_modals.js @@ -20,8 +20,8 @@ * limitations under the License. */ -var padutils = require('/pad_utils').padutils; -var paddocbar = require('/pad_docbar').paddocbar; +var padutils = require('ep_etherpad-lite/static/js/pad_utils').padutils; +var paddocbar = require('ep_etherpad-lite/static/js/pad_docbar').paddocbar; var padmodals = (function() { diff --git a/src/static/js/pad_savedrevs.js b/src/static/js/pad_savedrevs.js index 6d37dfa8..ae384118 100644 --- a/src/static/js/pad_savedrevs.js +++ b/src/static/js/pad_savedrevs.js @@ -20,8 +20,8 @@ * limitations under the License. */ -var padutils = require('/pad_utils').padutils; -var paddocbar = require('/pad_docbar').paddocbar; +var padutils = require('ep_etherpad-lite/static/js/pad_utils').padutils; +var paddocbar = require('ep_etherpad-lite/static/js/pad_docbar').paddocbar; var padsavedrevs = (function() { diff --git a/src/static/js/pad_userlist.js b/src/static/js/pad_userlist.js index 2c063d74..1b9d5dca 100644 --- a/src/static/js/pad_userlist.js +++ b/src/static/js/pad_userlist.js @@ -20,7 +20,7 @@ * limitations under the License. */ -var padutils = require('/pad_utils').padutils; +var padutils = require('ep_etherpad-lite/static/js/pad_utils').padutils; var myUserInfo = {}; diff --git a/src/static/js/pad_utils.js b/src/static/js/pad_utils.js index fb538211..96b48077 100644 --- a/src/static/js/pad_utils.js +++ b/src/static/js/pad_utils.js @@ -20,7 +20,7 @@ * limitations under the License. */ -var Security = require('/security'); +var Security = require('ep_etherpad-lite/static/js/security'); /** * Generates a random String with the given length. Is needed to generate the Author, Group, readonly, session Ids @@ -75,7 +75,7 @@ var padutils = { }, uniqueId: function() { - var pad = require('/pad').pad; // Sidestep circular dependency + var pad = require('ep_etherpad-lite/static/js/pad').pad; // Sidestep circular dependency function encodeNum(n, width) { // returns string that is exactly 'width' chars, padding with zeros @@ -250,7 +250,7 @@ var padutils = { }, timediff: function(d) { - var pad = require('/pad').pad; // Sidestep circular dependency + var pad = require('ep_etherpad-lite/static/js/pad').pad; // Sidestep circular dependency function format(n, word) { n = Math.round(n); @@ -520,7 +520,7 @@ function setupGlobalExceptionHandler() { padutils.setupGlobalExceptionHandler = setupGlobalExceptionHandler; -padutils.binarySearch = require('/ace2_common').binarySearch; +padutils.binarySearch = require('ep_etherpad-lite/static/js/ace2_common').binarySearch; exports.randomString = randomString; exports.createCookie = createCookie; diff --git a/src/static/js/timeslider.js b/src/static/js/timeslider.js index 143ef328..a4f31811 100644 --- a/src/static/js/timeslider.js +++ b/src/static/js/timeslider.js @@ -22,13 +22,13 @@ // These jQuery things should create local references, but for now `require()` // assigns to the global `$` and augments it with plugins. -require('/jquery'); -JSON = require('/json2'); -require('/undo-xpopup'); +require('ep_etherpad-lite/static/js/jquery'); +JSON = require('ep_etherpad-lite/static/js/json2'); +require('ep_etherpad-lite/static/js/undo-xpopup'); -var createCookie = require('/pad_utils').createCookie; -var readCookie = require('/pad_utils').readCookie; -var randomString = require('/pad_utils').randomString; +var createCookie = require('ep_etherpad-lite/static/js/pad_utils').createCookie; +var readCookie = require('ep_etherpad-lite/static/js/pad_utils').readCookie; +var randomString = require('ep_etherpad-lite/static/js/pad_utils').randomString; var socket, token, padId, export_links; @@ -127,12 +127,12 @@ function handleClientVars(message) clientVars = message.data; //load all script that doesn't work without the clientVars - BroadcastSlider = require('/broadcast_slider').loadBroadcastSliderJS(fireWhenAllScriptsAreLoaded); - require('/broadcast_revisions').loadBroadcastRevisionsJS(); - changesetLoader = require('/broadcast').loadBroadcastJS(socket, sendSocketMsg, fireWhenAllScriptsAreLoaded, BroadcastSlider); + BroadcastSlider = require('ep_etherpad-lite/static/js/broadcast_slider').loadBroadcastSliderJS(fireWhenAllScriptsAreLoaded); + require('ep_etherpad-lite/static/js/broadcast_revisions').loadBroadcastRevisionsJS(); + changesetLoader = require('ep_etherpad-lite/static/js/broadcast').loadBroadcastJS(socket, sendSocketMsg, fireWhenAllScriptsAreLoaded, BroadcastSlider); //initialize export ui - require('/pad_impexp').padimpexp.init(); + require('ep_etherpad-lite/static/js/pad_impexp').padimpexp.init(); //change export urls when the slider moves var export_rev_regex = /(\/\d+)?\/export/ diff --git a/src/static/js/undomodule.js b/src/static/js/undomodule.js index 886cbdf0..e30748e2 100644 --- a/src/static/js/undomodule.js +++ b/src/static/js/undomodule.js @@ -20,8 +20,8 @@ * limitations under the License. */ -var Changeset = require('/Changeset'); -var extend = require('/ace2_common').extend; +var Changeset = require('ep_etherpad-lite/static/js/Changeset'); +var extend = require('ep_etherpad-lite/static/js/ace2_common').extend; var undoModule = (function() { diff --git a/src/static/pad.html b/src/static/pad.html index 710b0f01..5019391d 100644 --- a/src/static/pad.html +++ b/src/static/pad.html @@ -298,13 +298,13 @@ (function () { require.setRootURI("../minified/"); require.setGlobalKeyPath("require"); - require('/pad').init(); + require('ep_etherpad-lite/static/js/pad').init(); /* TODO: These globals shouldn't exist. */ - pad = require('/pad').pad; - chat = require('/chat').chat; - padeditbar = require('/pad_editbar').padeditbar; - padimpexp = require('/pad_impexp').padimpexp; + pad = require('ep_etherpad-lite/static/js/pad').pad; + chat = require('ep_etherpad-lite/static/js/chat').chat; + padeditbar = require('ep_etherpad-lite/static/js/pad_editbar').padeditbar; + padimpexp = require('ep_etherpad-lite/static/js/pad_impexp').padimpexp; }()); diff --git a/src/static/timeslider.html b/src/static/timeslider.html index 579e26ef..b47f6c1d 100644 --- a/src/static/timeslider.html +++ b/src/static/timeslider.html @@ -206,11 +206,11 @@ (function () { require.setRootURI("../minified/"); require.setGlobalKeyPath("require"); - require('/timeslider').init(); + require('ep_etherpad-lite/static/js/timeslider').init(); /* TODO: These globals shouldn't exist. */ - padeditbar = require('/pad_editbar').padeditbar; - padimpexp = require('/pad_impexp').padimpexp; + padeditbar = require('ep_etherpad-lite/static/js/pad_editbar').padeditbar; + padimpexp = require('ep_etherpad-lite/static/js/pad_impexp').padimpexp; })(); From 2c7b84ca3ef6eac2a0773bedf47f4d69564e7236 Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Sun, 26 Feb 2012 22:01:52 +0100 Subject: [PATCH 040/297] Minify now supports plugins --- src/node/hooks/express/minified.js | 2 +- src/node/hooks/express/static.js | 3 +- src/node/utils/Minify.js | 59 +++++++++++++++++++----------- src/static/pad.html | 1 + 4 files changed, 41 insertions(+), 24 deletions(-) diff --git a/src/node/hooks/express/minified.js b/src/node/hooks/express/minified.js index 09a08cae..f8a988d7 100644 --- a/src/node/hooks/express/minified.js +++ b/src/node/hooks/express/minified.js @@ -2,5 +2,5 @@ var minify = require('../../utils/Minify'); exports.expressCreateServer = function (hook_name, args, cb) { //serve minified files - args.app.get('/minified/:filename', minify.minifyJS); + args.app.get(/^\/minified\/(.*)/, minify.minifyJS); } diff --git a/src/node/hooks/express/static.js b/src/node/hooks/express/static.js index 567b4d7d..ade5478a 100644 --- a/src/node/hooks/express/static.js +++ b/src/node/hooks/express/static.js @@ -6,7 +6,7 @@ exports.expressCreateServer = function (hook_name, args, cb) { //serve static files args.app.get('/static/js/require-kernel.js', function (req, res, next) { res.header("Content-Type","application/javascript; charset: utf-8"); - res.write(minify.requireDefinition() + "\n require.setLibraryURI('/plugins'); "); + res.write(minify.requireDefinition()); // + "\n require.setLibraryURI('/plugins'); "); res.end(); }); @@ -24,6 +24,7 @@ exports.expressCreateServer = function (hook_name, args, cb) { } var filePath = path.normalize(path.join(plugins.plugins[plugin_name].package.path, "static", url)); + res.sendfile(filePath, { maxAge: exports.maxAge }); }); diff --git a/src/node/utils/Minify.js b/src/node/utils/Minify.js index 3f983001..87ba7fbc 100644 --- a/src/node/utils/Minify.js +++ b/src/node/utils/Minify.js @@ -47,28 +47,30 @@ var tar = JSON.parse(fs.readFileSync(TAR_PATH, 'utf8')); */ exports.minifyJS = function(req, res, next) { - var jsFilename = req.params['filename']; + var jsFilename = req.params[0]; //choose the js files we need var jsFiles = undefined; if (Object.prototype.hasOwnProperty.call(tar, jsFilename)) { jsFiles = tar[jsFilename]; - _handle(req, res, jsFilename, jsFiles) } else { - // Not in tar list, but try anyways, if it fails, pass to `next`. + /* Not in tar list, but try anyways, if it fails, pass to `next`. + Actually try, not check in filesystem here because + we don't want to duplicate the require.resolve() handling + */ jsFiles = [jsFilename]; - fs.stat(JS_DIR + jsFilename, function (error, stats) { - if (error || !stats.isFile()) { - next(); - } else { - _handle(req, res, jsFilename, jsFiles); - } - }); } + _handle(req, res, jsFilename, jsFiles, function (err) { + console.log("Unable to load minified file " + jsFilename + ": " + err.toString()); + /* Throw away error and generate a 404, not 500 */ + next(); + }); } -function _handle(req, res, jsFilename, jsFiles) { +function _handle(req, res, jsFilename, jsFiles, next) { res.header("Content-Type","text/javascript"); + + var cacheName = CACHE_DIR + "/minified_" + jsFilename.replace(/\//g, "_"); //minifying is enabled if(settings.minify) @@ -119,7 +121,7 @@ function _handle(req, res, jsFilename, jsFiles) { function(callback) { //check the modification time of the minified js - fs.stat(CACHE_DIR + "/minified_" + jsFilename, function(err, stats) + fs.stat(cacheName, function(err, stats) { if(err && err.code != "ENOENT") { @@ -147,7 +149,7 @@ function _handle(req, res, jsFilename, jsFiles) { jsFiles , function (content) {values.push(content)} , function (err) { - if(ERR(err)) return; + if(ERR(err, next)) return; result = values.join(''); callback(); @@ -160,7 +162,7 @@ function _handle(req, res, jsFilename, jsFiles) { //write the results plain in a file function(callback) { - fs.writeFile(CACHE_DIR + "/minified_" + jsFilename, result, "utf8", callback); + fs.writeFile(cacheName, result, "utf8", callback); }, //write the results compressed in a file function(callback) @@ -171,7 +173,7 @@ function _handle(req, res, jsFilename, jsFiles) { if(ERR(err, callback)) return; - fs.writeFile(CACHE_DIR + "/minified_" + jsFilename + ".gz", compressedResult, callback); + fs.writeFile(cacheName + ".gz", compressedResult, callback); }); } ],callback); @@ -189,12 +191,12 @@ function _handle(req, res, jsFilename, jsFiles) { var pathStr; if(gzipSupport && os.type().indexOf("Windows") == -1) { - pathStr = path.normalize(CACHE_DIR + "/minified_" + jsFilename + ".gz"); + pathStr = path.normalize(cacheName + ".gz"); res.header('Content-Encoding', 'gzip'); } else { - pathStr = path.normalize(CACHE_DIR + "/minified_" + jsFilename ); + pathStr = path.normalize(cacheName); } res.sendfile(pathStr, { maxAge: server.maxAge }); @@ -207,7 +209,7 @@ function _handle(req, res, jsFilename, jsFiles) { jsFiles , function (content) {res.write(content)} , function (err) { - if(ERR(err)) return; + if(ERR(err, next)) return; res.end(); }); } @@ -288,16 +290,28 @@ function tarCode(jsFiles, write, callback) { write('require.define({'); var initialEntry = true; async.forEach(jsFiles, function (filename, callback){ + var path; + var srcPath; + if (filename.indexOf('plugins/') == 0) { + srcPath = filename.substring('plugins/'.length); + path = require.resolve(srcPath); + } else { + srcPath = '/' + filename; + path = JS_DIR + filename; + } + + srcPath = JSON.stringify(srcPath); + var srcPathAbbv = JSON.stringify(srcPath.replace(/\.js$/, '')); + if (filename == 'ace.js') { getAceFile(handleFile); } else { - fs.readFile(JS_DIR + filename, "utf8", handleFile); + fs.readFile(path, "utf8", handleFile); } function handleFile(err, data) { if(ERR(err, callback)) return; - var srcPath = JSON.stringify('/' + filename); - var srcPathAbbv = JSON.stringify('/' + filename.replace(/\.js$/, '')); + if (!initialEntry) { write('\n,'); } else { @@ -316,7 +330,8 @@ function tarCode(jsFiles, write, callback) { callback(); } - }, function () { + }, function (err) { + if(ERR(err, callback)) return; write('});\n'); callback(); }); diff --git a/src/static/pad.html b/src/static/pad.html index 710b0f01..0edf20b0 100644 --- a/src/static/pad.html +++ b/src/static/pad.html @@ -297,6 +297,7 @@ var clientVars = {}; (function () { require.setRootURI("../minified/"); + require.setLibraryURI("../minified/plugins/"); require.setGlobalKeyPath("require"); require('/pad').init(); From b20b86cdc8d536be6caa17f1d5feac298c51c852 Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Tue, 28 Feb 2012 17:52:30 +0100 Subject: [PATCH 041/297] Partial bugfix --- src/static/js/ace.js | 6 ++++-- src/static/js/pad_editbar.js | 4 ++-- src/static/timeslider.html | 1 + 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/static/js/ace.js b/src/static/js/ace.js index 3f64e19f..610aa33b 100644 --- a/src/static/js/ace.js +++ b/src/static/js/ace.js @@ -218,7 +218,7 @@ function Ace2Editor() } function pushRequireScriptTo(buffer) { var KERNEL_SOURCE = '../static/js/require-kernel.js'; - var KERNEL_BOOT = 'require.setRootURI("../minified/");\nrequire.setGlobalKeyPath("require");' + var KERNEL_BOOT = 'require.setRootURI("../minified/");\nrequire.setLibraryURI("../minified/plugins/");\nrequire.setGlobalKeyPath("require");' if (Ace2Editor.EMBEDED && Ace2Editor.EMBEDED[KERNEL_SOURCE]) { buffer.push('\ \ '); From a894fcd4f9d349c9dde5ead8952bc9eb438701af Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Tue, 28 Feb 2012 21:19:10 +0100 Subject: [PATCH 043/297] Removed CommonCode entierly --- bin/checkPad.js | 2 +- bin/convert.js | 2 +- src/node/db/AuthorManager.js | 2 +- src/node/db/GroupManager.js | 2 +- src/node/db/Pad.js | 2 +- src/node/db/ReadOnlyManager.js | 2 +- src/node/db/SecurityManager.js | 2 +- src/node/db/SessionManager.js | 2 +- src/node/easysync_tests.js | 2 +- src/node/handler/APIHandler.js | 2 +- src/node/handler/PadMessageHandler.js | 2 +- src/node/handler/TimesliderMessageHandler.js | 2 +- src/node/utils/ExportDokuWiki.js | 2 +- src/node/utils/ExportHtml.js | 2 +- src/node/utils/ImportHtml.js | 2 +- src/node/utils/common_code.js | 24 -------------------- 16 files changed, 15 insertions(+), 39 deletions(-) delete mode 100644 src/node/utils/common_code.js diff --git a/bin/checkPad.js b/bin/checkPad.js index 0cac0af1..a72f0060 100644 --- a/bin/checkPad.js +++ b/bin/checkPad.js @@ -15,7 +15,7 @@ var log4js = require("log4js"); log4js.setGlobalLogLevel("INFO"); var async = require("async"); var db = require('../node/db/DB'); -var CommonCode = require('../node/utils/common_code'); + var Changeset = require("ep_etherpad-lite/static/js/Changeset"); var padManager; diff --git a/bin/convert.js b/bin/convert.js index f4ddd29a..24fd393a 100644 --- a/bin/convert.js +++ b/bin/convert.js @@ -1,4 +1,4 @@ -var CommonCode = require('../node/utils/common_code'); + var startTime = new Date().getTime(); var fs = require("fs"); var ueberDB = require("ueberDB"); diff --git a/src/node/db/AuthorManager.js b/src/node/db/AuthorManager.js index 7a9c93c0..f644de12 100644 --- a/src/node/db/AuthorManager.js +++ b/src/node/db/AuthorManager.js @@ -18,7 +18,7 @@ * limitations under the License. */ -var CommonCode = require('../utils/common_code'); + var ERR = require("async-stacktrace"); var db = require("./DB").db; var async = require("async"); diff --git a/src/node/db/GroupManager.js b/src/node/db/GroupManager.js index 19b6857f..bd19507f 100644 --- a/src/node/db/GroupManager.js +++ b/src/node/db/GroupManager.js @@ -18,7 +18,7 @@ * limitations under the License. */ -var CommonCode = require('../utils/common_code'); + var ERR = require("async-stacktrace"); var customError = require("../utils/customError"); var randomString = require('ep_etherpad-lite/static/js/pad_utils').randomString; diff --git a/src/node/db/Pad.js b/src/node/db/Pad.js index c854c6af..b69780a4 100644 --- a/src/node/db/Pad.js +++ b/src/node/db/Pad.js @@ -2,7 +2,7 @@ * The pad object, defined with joose */ -var CommonCode = require('../utils/common_code'); + var ERR = require("async-stacktrace"); var Changeset = require("ep_etherpad-lite/static/js/Changeset"); var AttributePoolFactory = require("ep_etherpad-lite/static/js/AttributePoolFactory"); diff --git a/src/node/db/ReadOnlyManager.js b/src/node/db/ReadOnlyManager.js index 5df68a16..34340630 100644 --- a/src/node/db/ReadOnlyManager.js +++ b/src/node/db/ReadOnlyManager.js @@ -18,7 +18,7 @@ * limitations under the License. */ -var CommonCode = require('../utils/common_code'); + var ERR = require("async-stacktrace"); var db = require("./DB").db; var async = require("async"); diff --git a/src/node/db/SecurityManager.js b/src/node/db/SecurityManager.js index 0912308f..a092453a 100644 --- a/src/node/db/SecurityManager.js +++ b/src/node/db/SecurityManager.js @@ -18,7 +18,7 @@ * limitations under the License. */ -var CommonCode = require('../utils/common_code'); + var ERR = require("async-stacktrace"); var db = require("./DB").db; var async = require("async"); diff --git a/src/node/db/SessionManager.js b/src/node/db/SessionManager.js index b1c55632..ec4948a6 100644 --- a/src/node/db/SessionManager.js +++ b/src/node/db/SessionManager.js @@ -18,7 +18,7 @@ * limitations under the License. */ -var CommonCode = require('../utils/common_code'); + var ERR = require("async-stacktrace"); var customError = require("../utils/customError"); var randomString = require('ep_etherpad-lite/static/js/pad_utils').randomString; diff --git a/src/node/easysync_tests.js b/src/node/easysync_tests.js index ee41f7c6..7a148289 100644 --- a/src/node/easysync_tests.js +++ b/src/node/easysync_tests.js @@ -20,7 +20,7 @@ * limitations under the License. */ -var CommonCode = require('./utils/common_code'); + var Changeset = require("ep_etherpad-lite/static/js/Changeset"); var AttributePoolFactory = require("ep_etherpad-lite/static/js/AttributePoolFactory"); diff --git a/src/node/handler/APIHandler.js b/src/node/handler/APIHandler.js index f747201c..d4d7d6ce 100644 --- a/src/node/handler/APIHandler.js +++ b/src/node/handler/APIHandler.js @@ -18,7 +18,7 @@ * limitations under the License. */ -var CommonCode = require('../utils/common_code'); + var ERR = require("async-stacktrace"); var fs = require("fs"); var api = require("../db/API"); diff --git a/src/node/handler/PadMessageHandler.js b/src/node/handler/PadMessageHandler.js index c7ae1047..bfe7261d 100644 --- a/src/node/handler/PadMessageHandler.js +++ b/src/node/handler/PadMessageHandler.js @@ -18,7 +18,7 @@ * limitations under the License. */ -var CommonCode = require('../utils/common_code'); + var ERR = require("async-stacktrace"); var async = require("async"); var padManager = require("../db/PadManager"); diff --git a/src/node/handler/TimesliderMessageHandler.js b/src/node/handler/TimesliderMessageHandler.js index a1f570fb..0081e645 100644 --- a/src/node/handler/TimesliderMessageHandler.js +++ b/src/node/handler/TimesliderMessageHandler.js @@ -18,7 +18,7 @@ * limitations under the License. */ -var CommonCode = require('../utils/common_code'); + var ERR = require("async-stacktrace"); var async = require("async"); var padManager = require("../db/PadManager"); diff --git a/src/node/utils/ExportDokuWiki.js b/src/node/utils/ExportDokuWiki.js index ee774138..bcb21108 100644 --- a/src/node/utils/ExportDokuWiki.js +++ b/src/node/utils/ExportDokuWiki.js @@ -15,7 +15,7 @@ */ var async = require("async"); -var CommonCode = require('./common_code'); + var Changeset = require("ep_etherpad-lite/static/js/Changeset"); var padManager = require("../db/PadManager"); diff --git a/src/node/utils/ExportHtml.js b/src/node/utils/ExportHtml.js index 9b45cb61..91ebe59f 100644 --- a/src/node/utils/ExportHtml.js +++ b/src/node/utils/ExportHtml.js @@ -14,7 +14,7 @@ * limitations under the License. */ -var CommonCode = require('./common_code'); + var async = require("async"); var Changeset = require("ep_etherpad-lite/static/js/Changeset"); var padManager = require("../db/PadManager"); diff --git a/src/node/utils/ImportHtml.js b/src/node/utils/ImportHtml.js index c2bb9cc4..4b50b032 100644 --- a/src/node/utils/ImportHtml.js +++ b/src/node/utils/ImportHtml.js @@ -17,7 +17,7 @@ var jsdom = require('jsdom-nocontextifiy').jsdom; var log4js = require('log4js'); -var CommonCode = require('../utils/common_code'); + var Changeset = require("ep_etherpad-lite/static/js/Changeset"); var contentcollector = require("ep_etherpad-lite/static/js/contentcollector"); var map = require("ep_etherpad-lite/static/js/ace2_common").map; diff --git a/src/node/utils/common_code.js b/src/node/utils/common_code.js deleted file mode 100644 index 645a74ba..00000000 --- a/src/node/utils/common_code.js +++ /dev/null @@ -1,24 +0,0 @@ -/** - * Copyright 2009 Google Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS-IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -var RequireKernel = require('require-kernel/'); -var path = require('path'); - -var CLIENT_JS_SRC = path.normalize(__dirname + '/../../static/js/'); -var client_require = RequireKernel.requireForPaths( - 'file://' + (CLIENT_JS_SRC.charAt(0) == '/' ? '' : '/') + encodeURI(CLIENT_JS_SRC)); - -exports.require = client_require; From 30b5a92bd0c2c7826ce7bff0377891beb0b9eac5 Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Wed, 29 Feb 2012 16:04:57 +0100 Subject: [PATCH 044/297] Bugfix for dependency --- available_plugins/ep_fintest/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/available_plugins/ep_fintest/package.json b/available_plugins/ep_fintest/package.json index 342bef59..e221b5c1 100644 --- a/available_plugins/ep_fintest/package.json +++ b/available_plugins/ep_fintest/package.json @@ -4,6 +4,6 @@ "version": "0.0.1", "author": "RedHog (Egil Moeller) ", "contributors": [], - "dependencies": {"etherpad-lite": "1"}, + "dependencies": {}, "engines": { "node": ">= 0.4.1 < 0.7.0" } } From c9797a3714476cceada3e05acc8b29b28bc9804d Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Wed, 29 Feb 2012 16:05:25 +0100 Subject: [PATCH 045/297] Bugfix for dependency data circle --- src/node/pluginfw/plugins.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/node/pluginfw/plugins.js b/src/node/pluginfw/plugins.js index 0e8ca45b..e9194c4a 100644 --- a/src/node/pluginfw/plugins.js +++ b/src/node/pluginfw/plugins.js @@ -73,6 +73,7 @@ exports.getPackages = function (cb) { } if (deps[name].dependencies !== undefined) flatten(deps[name].dependencies); + delete deps[name].dependencies; }); } flatten([data]); From 35626df77bd6f9ad90eda7a82c16cb021738b04b Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Wed, 29 Feb 2012 16:05:44 +0100 Subject: [PATCH 046/297] Send plugin data to client --- src/node/handler/PadMessageHandler.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/node/handler/PadMessageHandler.js b/src/node/handler/PadMessageHandler.js index bfe7261d..924d8352 100644 --- a/src/node/handler/PadMessageHandler.js +++ b/src/node/handler/PadMessageHandler.js @@ -28,6 +28,7 @@ var authorManager = require("../db/AuthorManager"); var readOnlyManager = require("../db/ReadOnlyManager"); var settings = require('../utils/Settings'); var securityManager = require("../db/SecurityManager"); +var plugins = require("../pluginfw/plugins.js"); var log4js = require('log4js'); var messageLogger = log4js.getLogger("message"); @@ -800,9 +801,12 @@ function handleClientReady(client, message) "hideSidebar": false }, "abiwordAvailable": settings.abiwordAvailable(), - "hooks": {} + "plugins": { + "plugins": plugins.plugins, + "parts": plugins.parts, + } } - + //Add a username to the clientVars if one avaiable if(authorName != null) { From 73aa0687b8cd696ded66208f5550d83c2a62739c Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Thu, 1 Mar 2012 18:45:02 +0100 Subject: [PATCH 047/297] Client side hooks are now loaded and works --- available_plugins/ep_fintest/ep.json | 3 + .../ep_fintest/static/js/test.js | 4 + src/node/hooks/express/static.js | 9 + src/static/js/pluginfw/async.js | 690 ++++++++++++++++++ src/static/js/pluginfw/hooks.js | 63 ++ src/static/js/pluginfw/plugins.js | 179 +++++ src/static/pad.html | 18 +- 7 files changed, 959 insertions(+), 7 deletions(-) create mode 100644 src/static/js/pluginfw/async.js create mode 100644 src/static/js/pluginfw/hooks.js create mode 100644 src/static/js/pluginfw/plugins.js diff --git a/available_plugins/ep_fintest/ep.json b/available_plugins/ep_fintest/ep.json index aec7d9c1..f9e91491 100644 --- a/available_plugins/ep_fintest/ep.json +++ b/available_plugins/ep_fintest/ep.json @@ -26,6 +26,9 @@ "somehookname": "ep_fintest/otherpart:somehook", "morehook": "ep_fintest/otherpart:morehook", "expressCreateServer": "ep_fintest/otherpart:expressServer" + }, + "client_hooks": { + "somehookname": "ep_fintest/static/js/test:bar" } } ] diff --git a/available_plugins/ep_fintest/static/js/test.js b/available_plugins/ep_fintest/static/js/test.js index 7dc8e61a..22d58cc2 100644 --- a/available_plugins/ep_fintest/static/js/test.js +++ b/available_plugins/ep_fintest/static/js/test.js @@ -1 +1,5 @@ exports.foo = 42; + +exports.bar = function (hook_name, args, cb) { + return cb(["FOOOO"]); +} \ No newline at end of file diff --git a/src/node/hooks/express/static.js b/src/node/hooks/express/static.js index ade5478a..093d0a04 100644 --- a/src/node/hooks/express/static.js +++ b/src/node/hooks/express/static.js @@ -10,6 +10,15 @@ exports.expressCreateServer = function (hook_name, args, cb) { res.end(); }); + // serve plugin definitions + // not very static, but served here so that client can do require("pluginfw/static/js/plugin-definitions.js"); + args.app.get('/pluginfw/plugin-definitions.json', function (req, res, next) { + res.header("Content-Type","application/json; charset: utf-8"); + res.write(JSON.stringify({"plugins": plugins.plugins, "parts": plugins.parts})); + res.end(); + }); + + /* Handle static files for plugins: paths like "/static/plugins/ep_myplugin/js/test.js" are rewritten into ROOT_PATH_OF_MYPLUGIN/static/js/test.js, diff --git a/src/static/js/pluginfw/async.js b/src/static/js/pluginfw/async.js new file mode 100644 index 00000000..c862008a --- /dev/null +++ b/src/static/js/pluginfw/async.js @@ -0,0 +1,690 @@ +/*global setTimeout: false, console: false */ +(function () { + + var async = {}; + + // global on the server, window in the browser + var root = this, + previous_async = root.async; + + if (typeof module !== 'undefined' && module.exports) { + module.exports = async; + } + else { + root.async = async; + } + + async.noConflict = function () { + root.async = previous_async; + return async; + }; + + //// cross-browser compatiblity functions //// + + var _forEach = function (arr, iterator) { + if (arr.forEach) { + return arr.forEach(iterator); + } + for (var i = 0; i < arr.length; i += 1) { + iterator(arr[i], i, arr); + } + }; + + var _map = function (arr, iterator) { + if (arr.map) { + return arr.map(iterator); + } + var results = []; + _forEach(arr, function (x, i, a) { + results.push(iterator(x, i, a)); + }); + return results; + }; + + var _reduce = function (arr, iterator, memo) { + if (arr.reduce) { + return arr.reduce(iterator, memo); + } + _forEach(arr, function (x, i, a) { + memo = iterator(memo, x, i, a); + }); + return memo; + }; + + var _keys = function (obj) { + if (Object.keys) { + return Object.keys(obj); + } + var keys = []; + for (var k in obj) { + if (obj.hasOwnProperty(k)) { + keys.push(k); + } + } + return keys; + }; + + var _indexOf = function (arr, item) { + if (arr.indexOf) { + return arr.indexOf(item); + } + for (var i = 0; i < arr.length; i += 1) { + if (arr[i] === item) { + return i; + } + } + return -1; + }; + + //// exported async module functions //// + + //// nextTick implementation with browser-compatible fallback //// + if (typeof process === 'undefined' || !(process.nextTick)) { + async.nextTick = function (fn) { + setTimeout(fn, 0); + }; + } + else { + async.nextTick = process.nextTick; + } + + async.forEach = function (arr, iterator, callback) { + if (!arr.length) { + return callback(); + } + var completed = 0; + _forEach(arr, function (x) { + iterator(x, function (err) { + if (err) { + callback(err); + callback = function () {}; + } + else { + completed += 1; + if (completed === arr.length) { + callback(); + } + } + }); + }); + }; + + async.forEachSeries = function (arr, iterator, callback) { + if (!arr.length) { + return callback(); + } + var completed = 0; + var iterate = function () { + iterator(arr[completed], function (err) { + if (err) { + callback(err); + callback = function () {}; + } + else { + completed += 1; + if (completed === arr.length) { + callback(); + } + else { + iterate(); + } + } + }); + }; + iterate(); + }; + + async.forEachLimit = function (arr, limit, iterator, callback) { + if (!arr.length || limit <= 0) { + return callback(); + } + var completed = 0; + var started = 0; + var running = 0; + + (function replenish () { + if (completed === arr.length) { + return callback(); + } + + while (running < limit && started < arr.length) { + iterator(arr[started], function (err) { + if (err) { + callback(err); + callback = function () {}; + } + else { + completed += 1; + running -= 1; + if (completed === arr.length) { + callback(); + } + else { + replenish(); + } + } + }); + started += 1; + running += 1; + } + })(); + }; + + + var doParallel = function (fn) { + return function () { + var args = Array.prototype.slice.call(arguments); + return fn.apply(null, [async.forEach].concat(args)); + }; + }; + var doSeries = function (fn) { + return function () { + var args = Array.prototype.slice.call(arguments); + return fn.apply(null, [async.forEachSeries].concat(args)); + }; + }; + + + var _asyncMap = function (eachfn, arr, iterator, callback) { + var results = []; + arr = _map(arr, function (x, i) { + return {index: i, value: x}; + }); + eachfn(arr, function (x, callback) { + iterator(x.value, function (err, v) { + results[x.index] = v; + callback(err); + }); + }, function (err) { + callback(err, results); + }); + }; + async.map = doParallel(_asyncMap); + async.mapSeries = doSeries(_asyncMap); + + + // reduce only has a series version, as doing reduce in parallel won't + // work in many situations. + async.reduce = function (arr, memo, iterator, callback) { + async.forEachSeries(arr, function (x, callback) { + iterator(memo, x, function (err, v) { + memo = v; + callback(err); + }); + }, function (err) { + callback(err, memo); + }); + }; + // inject alias + async.inject = async.reduce; + // foldl alias + async.foldl = async.reduce; + + async.reduceRight = function (arr, memo, iterator, callback) { + var reversed = _map(arr, function (x) { + return x; + }).reverse(); + async.reduce(reversed, memo, iterator, callback); + }; + // foldr alias + async.foldr = async.reduceRight; + + var _filter = function (eachfn, arr, iterator, callback) { + var results = []; + arr = _map(arr, function (x, i) { + return {index: i, value: x}; + }); + eachfn(arr, function (x, callback) { + iterator(x.value, function (v) { + if (v) { + results.push(x); + } + callback(); + }); + }, function (err) { + callback(_map(results.sort(function (a, b) { + return a.index - b.index; + }), function (x) { + return x.value; + })); + }); + }; + async.filter = doParallel(_filter); + async.filterSeries = doSeries(_filter); + // select alias + async.select = async.filter; + async.selectSeries = async.filterSeries; + + var _reject = function (eachfn, arr, iterator, callback) { + var results = []; + arr = _map(arr, function (x, i) { + return {index: i, value: x}; + }); + eachfn(arr, function (x, callback) { + iterator(x.value, function (v) { + if (!v) { + results.push(x); + } + callback(); + }); + }, function (err) { + callback(_map(results.sort(function (a, b) { + return a.index - b.index; + }), function (x) { + return x.value; + })); + }); + }; + async.reject = doParallel(_reject); + async.rejectSeries = doSeries(_reject); + + var _detect = function (eachfn, arr, iterator, main_callback) { + eachfn(arr, function (x, callback) { + iterator(x, function (result) { + if (result) { + main_callback(x); + main_callback = function () {}; + } + else { + callback(); + } + }); + }, function (err) { + main_callback(); + }); + }; + async.detect = doParallel(_detect); + async.detectSeries = doSeries(_detect); + + async.some = function (arr, iterator, main_callback) { + async.forEach(arr, function (x, callback) { + iterator(x, function (v) { + if (v) { + main_callback(true); + main_callback = function () {}; + } + callback(); + }); + }, function (err) { + main_callback(false); + }); + }; + // any alias + async.any = async.some; + + async.every = function (arr, iterator, main_callback) { + async.forEach(arr, function (x, callback) { + iterator(x, function (v) { + if (!v) { + main_callback(false); + main_callback = function () {}; + } + callback(); + }); + }, function (err) { + main_callback(true); + }); + }; + // all alias + async.all = async.every; + + async.sortBy = function (arr, iterator, callback) { + async.map(arr, function (x, callback) { + iterator(x, function (err, criteria) { + if (err) { + callback(err); + } + else { + callback(null, {value: x, criteria: criteria}); + } + }); + }, function (err, results) { + if (err) { + return callback(err); + } + else { + var fn = function (left, right) { + var a = left.criteria, b = right.criteria; + return a < b ? -1 : a > b ? 1 : 0; + }; + callback(null, _map(results.sort(fn), function (x) { + return x.value; + })); + } + }); + }; + + async.auto = function (tasks, callback) { + callback = callback || function () {}; + var keys = _keys(tasks); + if (!keys.length) { + return callback(null); + } + + var results = {}; + + var listeners = []; + var addListener = function (fn) { + listeners.unshift(fn); + }; + var removeListener = function (fn) { + for (var i = 0; i < listeners.length; i += 1) { + if (listeners[i] === fn) { + listeners.splice(i, 1); + return; + } + } + }; + var taskComplete = function () { + _forEach(listeners, function (fn) { + fn(); + }); + }; + + addListener(function () { + if (_keys(results).length === keys.length) { + callback(null, results); + } + }); + + _forEach(keys, function (k) { + var task = (tasks[k] instanceof Function) ? [tasks[k]]: tasks[k]; + var taskCallback = function (err) { + if (err) { + callback(err); + // stop subsequent errors hitting callback multiple times + callback = function () {}; + } + else { + var args = Array.prototype.slice.call(arguments, 1); + if (args.length <= 1) { + args = args[0]; + } + results[k] = args; + taskComplete(); + } + }; + var requires = task.slice(0, Math.abs(task.length - 1)) || []; + var ready = function () { + return _reduce(requires, function (a, x) { + return (a && results.hasOwnProperty(x)); + }, true); + }; + if (ready()) { + task[task.length - 1](taskCallback, results); + } + else { + var listener = function () { + if (ready()) { + removeListener(listener); + task[task.length - 1](taskCallback, results); + } + }; + addListener(listener); + } + }); + }; + + async.waterfall = function (tasks, callback) { + if (!tasks.length) { + return callback(); + } + callback = callback || function () {}; + var wrapIterator = function (iterator) { + return function (err) { + if (err) { + callback(err); + callback = function () {}; + } + else { + var args = Array.prototype.slice.call(arguments, 1); + var next = iterator.next(); + if (next) { + args.push(wrapIterator(next)); + } + else { + args.push(callback); + } + async.nextTick(function () { + iterator.apply(null, args); + }); + } + }; + }; + wrapIterator(async.iterator(tasks))(); + }; + + async.parallel = function (tasks, callback) { + callback = callback || function () {}; + if (tasks.constructor === Array) { + async.map(tasks, function (fn, callback) { + if (fn) { + fn(function (err) { + var args = Array.prototype.slice.call(arguments, 1); + if (args.length <= 1) { + args = args[0]; + } + callback.call(null, err, args); + }); + } + }, callback); + } + else { + var results = {}; + async.forEach(_keys(tasks), function (k, callback) { + tasks[k](function (err) { + var args = Array.prototype.slice.call(arguments, 1); + if (args.length <= 1) { + args = args[0]; + } + results[k] = args; + callback(err); + }); + }, function (err) { + callback(err, results); + }); + } + }; + + async.series = function (tasks, callback) { + callback = callback || function () {}; + if (tasks.constructor === Array) { + async.mapSeries(tasks, function (fn, callback) { + if (fn) { + fn(function (err) { + var args = Array.prototype.slice.call(arguments, 1); + if (args.length <= 1) { + args = args[0]; + } + callback.call(null, err, args); + }); + } + }, callback); + } + else { + var results = {}; + async.forEachSeries(_keys(tasks), function (k, callback) { + tasks[k](function (err) { + var args = Array.prototype.slice.call(arguments, 1); + if (args.length <= 1) { + args = args[0]; + } + results[k] = args; + callback(err); + }); + }, function (err) { + callback(err, results); + }); + } + }; + + async.iterator = function (tasks) { + var makeCallback = function (index) { + var fn = function () { + if (tasks.length) { + tasks[index].apply(null, arguments); + } + return fn.next(); + }; + fn.next = function () { + return (index < tasks.length - 1) ? makeCallback(index + 1): null; + }; + return fn; + }; + return makeCallback(0); + }; + + async.apply = function (fn) { + var args = Array.prototype.slice.call(arguments, 1); + return function () { + return fn.apply( + null, args.concat(Array.prototype.slice.call(arguments)) + ); + }; + }; + + var _concat = function (eachfn, arr, fn, callback) { + var r = []; + eachfn(arr, function (x, cb) { + fn(x, function (err, y) { + r = r.concat(y || []); + cb(err); + }); + }, function (err) { + callback(err, r); + }); + }; + async.concat = doParallel(_concat); + async.concatSeries = doSeries(_concat); + + async.whilst = function (test, iterator, callback) { + if (test()) { + iterator(function (err) { + if (err) { + return callback(err); + } + async.whilst(test, iterator, callback); + }); + } + else { + callback(); + } + }; + + async.until = function (test, iterator, callback) { + if (!test()) { + iterator(function (err) { + if (err) { + return callback(err); + } + async.until(test, iterator, callback); + }); + } + else { + callback(); + } + }; + + async.queue = function (worker, concurrency) { + var workers = 0; + var q = { + tasks: [], + concurrency: concurrency, + saturated: null, + empty: null, + drain: null, + push: function (data, callback) { + q.tasks.push({data: data, callback: callback}); + if(q.saturated && q.tasks.length == concurrency) q.saturated(); + async.nextTick(q.process); + }, + process: function () { + if (workers < q.concurrency && q.tasks.length) { + var task = q.tasks.shift(); + if(q.empty && q.tasks.length == 0) q.empty(); + workers += 1; + worker(task.data, function () { + workers -= 1; + if (task.callback) { + task.callback.apply(task, arguments); + } + if(q.drain && q.tasks.length + workers == 0) q.drain(); + q.process(); + }); + } + }, + length: function () { + return q.tasks.length; + }, + running: function () { + return workers; + } + }; + return q; + }; + + var _console_fn = function (name) { + return function (fn) { + var args = Array.prototype.slice.call(arguments, 1); + fn.apply(null, args.concat([function (err) { + var args = Array.prototype.slice.call(arguments, 1); + if (typeof console !== 'undefined') { + if (err) { + if (console.error) { + console.error(err); + } + } + else if (console[name]) { + _forEach(args, function (x) { + console[name](x); + }); + } + } + }])); + }; + }; + async.log = _console_fn('log'); + async.dir = _console_fn('dir'); + /*async.info = _console_fn('info'); + async.warn = _console_fn('warn'); + async.error = _console_fn('error');*/ + + async.memoize = function (fn, hasher) { + var memo = {}; + var queues = {}; + hasher = hasher || function (x) { + return x; + }; + var memoized = function () { + var args = Array.prototype.slice.call(arguments); + var callback = args.pop(); + var key = hasher.apply(null, args); + if (key in memo) { + callback.apply(null, memo[key]); + } + else if (key in queues) { + queues[key].push(callback); + } + else { + queues[key] = [callback]; + fn.apply(null, args.concat([function () { + memo[key] = arguments; + var q = queues[key]; + delete queues[key]; + for (var i = 0, l = q.length; i < l; i++) { + q[i].apply(null, arguments); + } + }])); + } + }; + memoized.unmemoized = fn; + return memoized; + }; + + async.unmemoize = function (fn) { + return function () { + return (fn.unmemoized || fn).apply(null, arguments); + } + }; + +}()); diff --git a/src/static/js/pluginfw/hooks.js b/src/static/js/pluginfw/hooks.js new file mode 100644 index 00000000..383a2a2c --- /dev/null +++ b/src/static/js/pluginfw/hooks.js @@ -0,0 +1,63 @@ +var plugins = require("ep_etherpad-lite/static/js/pluginfw/plugins"); + +/* 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"); +} else { + var async = require("async"); +} + +var hookCallWrapper = function (hook, hook_name, args, cb) { + if (cb === undefined) cb = function (x) { return x; }; + try { + return hook.hook_fn(hook_name, args, cb); + } catch (ex) { + console.error([hook_name, hook.part.full_name, ex]); + } +} + + +/* Don't use Array.concat as it flatterns arrays within the array */ +exports.flatten = function (lst) { + var res = []; + if (lst != undefined && lst != null) { + for (var i = 0; i < lst.length; i++) { + if (lst[i] != undefined && lst[i] != null) { + for (var j = 0; j < lst[i].length; j++) { + res.push(lst[i][j]); + } + } + } + } + return res; +} + +exports.callAll = function (hook_name, args) { + if (plugins.hooks[hook_name] === undefined) return []; + return exports.flatten(plugins.hooks[hook_name].map(function (hook) { + return hookCallWrapper(hook, hook_name, args); + })); +} + +exports.aCallAll = function (hook_name, args, cb) { + if (plugins.hooks[hook_name] === undefined) cb([]); + async.map( + plugins.hooks[hook_name], + function (hook, cb) { + hookCallWrapper(hook, hook_name, args, function (res) { cb(null, res); }); + }, + function (err, res) { + cb(exports.flatten(res)); + } + ); +} + +exports.callFirst = function (hook_name, args) { + if (plugins.hooks[hook_name][0] === undefined) return []; + return exports.flatten(hookCallWrapper(plugins.hooks[hook_name][0], hook_name, args)); +} + +exports.aCallFirst = function (hook_name, args, cb) { + if (plugins.hooks[hook_name][0] === undefined) cb([]); + hookCallWrapper(plugins.hooks[hook_name][0], hook_name, args, function (res) { cb(exports.flatten(res)); }); +} diff --git a/src/static/js/pluginfw/plugins.js b/src/static/js/pluginfw/plugins.js new file mode 100644 index 00000000..c5c21903 --- /dev/null +++ b/src/static/js/pluginfw/plugins.js @@ -0,0 +1,179 @@ +exports.isClient = typeof global != "object"; + +if (!exports.isClient) { + var npm = require("npm/lib/npm.js"); + var readInstalled = require("npm/lib/utils/read-installed.js"); + var relativize = require("npm/lib/utils/relativize.js"); + var readJson = require("npm/lib/utils/read-json.js"); + var path = require("path"); + var async = require("async"); + var fs = require("fs"); + var tsort = require("./tsort"); + var util = require("util"); +} + +exports.prefix = 'ep_'; +exports.loaded = false; +exports.plugins = {}; +exports.parts = []; +exports.hooks = {}; + +exports.ensure = function (cb) { + if (!exports.loaded) + exports.update(cb); + else + cb(); +} + +exports.formatPlugins = function () { + return Object.keys(exports.plugins).join(", "); +} + +exports.formatParts = function () { + return exports.parts.map(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) { + res.push(hook.hook_name + ": " + hook.hook_fn_name + " from " + hook.part.full_name); + }); + }); + return res.join("\n"); +} + +exports.loadFn = function (path) { + var x = path.split(":"); + var fn = require(x[0]); + x[1].split(".").forEach(function (name) { + fn = fn[name]; + }); + return fn; +} + +exports.extractHooks = function (parts, hook_set_name) { + var hooks = {}; + parts.forEach(function (part) { + Object.keys(part[hook_set_name] || {}).forEach(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]); + if (hook_fn) { + hooks[hook_name].push({"hook_name": hook_name, "hook_fn": hook_fn, "hook_fn_name": hook_fn_name, "part": part}); + } else { + console.error("Unable to load hook function for " + part.full_name + " for hook " + hook_name + ": " + part.hooks[hook_name]); + } + }); + }); + return hooks; +} + + +if (exports.isClient) { + exports.update = function (cb) { + jQuery.getJSON('/pluginfw/plugin-definitions.json', function(data) { + exports.plugins = data.plugins; + exports.parts = data.parts; + exports.hooks = exports.extractHooks(exports.parts, "client_hooks"); + exports.loaded = true; + cb(); + }); + } +} else { + +exports.update = function (cb) { + exports.getPackages(function (er, packages) { + var parts = []; + var plugins = {}; + // Load plugin metadata ep.json + async.forEach( + Object.keys(packages), + function (plugin_name, cb) { + exports.loadPlugin(packages, plugin_name, plugins, parts, cb); + }, + function (err) { + exports.plugins = plugins; + exports.parts = exports.sortParts(parts); + exports.hooks = exports.extractHooks(exports.parts, "hooks"); + exports.loaded = true; + cb(err); + } + ); + }); +} + +exports.getPackages = function (cb) { + // Load list of installed NPM packages, flatten it to a list, and filter out only packages with names that + var dir = path.resolve(npm.dir, '..'); + readInstalled(dir, function (er, data) { + if (er) cb(er, null); + var packages = {}; + function flatten(deps) { + Object.keys(deps).forEach(function (name) { + if (name.indexOf(exports.prefix) == 0) { + packages[name] = deps[name]; + } + if (deps[name].dependencies !== undefined) + flatten(deps[name].dependencies); + delete deps[name].dependencies; + }); + } + flatten([data]); + cb(null, packages); + }); +} + +exports.loadPlugin = function (packages, plugin_name, plugins, parts, cb) { + var plugin_path = path.resolve(packages[plugin_name].path, "ep.json"); + fs.readFile( + plugin_path, + function (er, data) { + if (er) { + console.error("Unable to load plugin definition file " + plugin_path); + return cb(); + } + try { + var plugin = JSON.parse(data); + plugin.package = packages[plugin_name]; + plugins[plugin_name] = plugin; + plugin.parts.forEach(function (part) { + part.plugin = plugin_name; + part.full_name = plugin_name + "/" + part.name; + parts[part.full_name] = part; + }); + } catch (ex) { + console.error("Unable to parse plugin definition file " + plugin_path + ": " + ex.toString()); + } + cb(); + } + ); +} + +exports.partsToParentChildList = function (parts) { + var res = []; + Object.keys(parts).forEach(function (name) { + (parts[name].post || []).forEach(function (child_name) { + res.push([name, child_name]); + }); + (parts[name].pre || []).forEach(function (parent_name) { + res.push([parent_name, name]); + }); + if (!parts[name].pre && !parts[name].post) { + res.push([name, ":" + name]); // Include apps with no dependency info + } + }); + return res; +} + +exports.sortParts = function(parts) { + return tsort( + exports.partsToParentChildList(parts) + ).filter( + function (name) { return parts[name] !== undefined; } + ).map( + function (name) { return parts[name]; } + ); +}; + +} \ No newline at end of file diff --git a/src/static/pad.html b/src/static/pad.html index 0160c60b..38595daf 100644 --- a/src/static/pad.html +++ b/src/static/pad.html @@ -290,22 +290,26 @@ + - From 81440cd85605c3e584cba18cf868bab1629c63ba Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Thu, 1 Mar 2012 19:00:58 +0100 Subject: [PATCH 048/297] Removed old pluginfw stuff --- src/ep.json | 20 +-- src/node/handler/PadMessageHandler.js | 2 +- src/node/hooks/express/socketio.js | 2 +- src/node/hooks/express/static.js | 2 +- src/node/pluginfw/hooks.js | 58 -------- src/node/pluginfw/plugins.js | 160 ---------------------- src/node/pluginfw/require.js | 42 ------ src/node/server.js | 4 +- src/{node => static/js}/pluginfw/tsort.js | 0 9 files changed, 15 insertions(+), 275 deletions(-) delete mode 100644 src/node/pluginfw/hooks.js delete mode 100644 src/node/pluginfw/plugins.js delete mode 100644 src/node/pluginfw/require.js rename src/{node => static/js}/pluginfw/tsort.js (100%) diff --git a/src/ep.json b/src/ep.json index 0c777c47..bc955dbf 100644 --- a/src/ep.json +++ b/src/ep.json @@ -1,15 +1,15 @@ { "parts": [ - { "name": "static", "hooks": { "expressCreateServer": "../hooks/express/static:expressCreateServer" } }, - { "name": "specialpages", "hooks": { "expressCreateServer": "../hooks/express/specialpages:expressCreateServer" } }, - { "name": "padurlsanitize", "hooks": { "expressCreateServer": "../hooks/express/padurlsanitize:expressCreateServer" } }, - { "name": "minified", "hooks": { "expressCreateServer": "../hooks/express/minified:expressCreateServer" } }, - { "name": "padreadonly", "hooks": { "expressCreateServer": "../hooks/express/padreadonly:expressCreateServer" } }, - { "name": "webaccess", "hooks": { "expressConfigure": "../hooks/express/webaccess:expressConfigure" } }, - { "name": "apicalls", "hooks": { "expressCreateServer": "../hooks/express/apicalls:expressCreateServer" } }, - { "name": "importexport", "hooks": { "expressCreateServer": "../hooks/express/importexport:expressCreateServer" } }, - { "name": "errorhandling", "hooks": { "expressCreateServer": "../hooks/express/errorhandling:expressCreateServer" } }, - { "name": "socketio", "hooks": { "expressCreateServer": "../hooks/express/socketio:expressCreateServer" } } + { "name": "static", "hooks": { "expressCreateServer": "ep_etherpad-lite/node/hooks/express/static:expressCreateServer" } }, + { "name": "specialpages", "hooks": { "expressCreateServer": "ep_etherpad-lite/node/hooks/express/specialpages:expressCreateServer" } }, + { "name": "padurlsanitize", "hooks": { "expressCreateServer": "ep_etherpad-lite/node/hooks/express/padurlsanitize:expressCreateServer" } }, + { "name": "minified", "hooks": { "expressCreateServer": "ep_etherpad-lite/node/hooks/express/minified:expressCreateServer" } }, + { "name": "padreadonly", "hooks": { "expressCreateServer": "ep_etherpad-lite/node/hooks/express/padreadonly:expressCreateServer" } }, + { "name": "webaccess", "hooks": { "expressConfigure": "ep_etherpad-lite/node/hooks/express/webaccess:expressConfigure" } }, + { "name": "apicalls", "hooks": { "expressCreateServer": "ep_etherpad-lite/node/hooks/express/apicalls:expressCreateServer" } }, + { "name": "importexport", "hooks": { "expressCreateServer": "ep_etherpad-lite/node/hooks/express/importexport:expressCreateServer" } }, + { "name": "errorhandling", "hooks": { "expressCreateServer": "ep_etherpad-lite/node/hooks/express/errorhandling:expressCreateServer" } }, + { "name": "socketio", "hooks": { "expressCreateServer": "ep_etherpad-lite/node/hooks/express/socketio:expressCreateServer" } } ] } diff --git a/src/node/handler/PadMessageHandler.js b/src/node/handler/PadMessageHandler.js index 924d8352..e26bb46e 100644 --- a/src/node/handler/PadMessageHandler.js +++ b/src/node/handler/PadMessageHandler.js @@ -28,7 +28,7 @@ var authorManager = require("../db/AuthorManager"); var readOnlyManager = require("../db/ReadOnlyManager"); var settings = require('../utils/Settings'); var securityManager = require("../db/SecurityManager"); -var plugins = require("../pluginfw/plugins.js"); +var plugins = require("ep_etherpad-lite/static/js/pluginfw/plugins.js"); var log4js = require('log4js'); var messageLogger = log4js.getLogger("message"); diff --git a/src/node/hooks/express/socketio.js b/src/node/hooks/express/socketio.js index bc65c7b7..e040f7ac 100644 --- a/src/node/hooks/express/socketio.js +++ b/src/node/hooks/express/socketio.js @@ -2,7 +2,7 @@ var log4js = require('log4js'); var socketio = require('socket.io'); var settings = require('../../utils/Settings'); var socketIORouter = require("../../handler/SocketIORouter"); -var hooks = require("../../pluginfw/hooks"); +var hooks = require("ep_etherpad-lite/static/js/pluginfw/hooks"); var padMessageHandler = require("../../handler/PadMessageHandler"); var timesliderMessageHandler = require("../../handler/TimesliderMessageHandler"); diff --git a/src/node/hooks/express/static.js b/src/node/hooks/express/static.js index 093d0a04..461d76af 100644 --- a/src/node/hooks/express/static.js +++ b/src/node/hooks/express/static.js @@ -1,6 +1,6 @@ var path = require('path'); var minify = require('../../utils/Minify'); -var plugins = require("../../pluginfw/plugins"); +var plugins = require("ep_etherpad-lite/static/js/pluginfw/plugins"); exports.expressCreateServer = function (hook_name, args, cb) { //serve static files diff --git a/src/node/pluginfw/hooks.js b/src/node/pluginfw/hooks.js deleted file mode 100644 index 2484c3d5..00000000 --- a/src/node/pluginfw/hooks.js +++ /dev/null @@ -1,58 +0,0 @@ -var plugins = require("./plugins"); -var async = require("async"); - - -var hookCallWrapper = function (hook, hook_name, args, cb) { - if (cb === undefined) cb = function (x) { return x; }; - try { - return hook.hook_fn(hook_name, args, cb); - } catch (ex) { - console.error([hook_name, hook.part.full_name, ex]); - } -} - - -/* Don't use Array.concat as it flatterns arrays within the array */ -exports.flatten = function (lst) { - var res = []; - if (lst != undefined && lst != null) { - for (var i = 0; i < lst.length; i++) { - if (lst[i] != undefined && lst[i] != null) { - for (var j = 0; j < lst[i].length; j++) { - res.push(lst[i][j]); - } - } - } - } - return res; -} - -exports.callAll = function (hook_name, args) { - if (plugins.hooks[hook_name] === undefined) return []; - return exports.flatten(plugins.hooks[hook_name].map(function (hook) { - return hookCallWrapper(hook, hook_name, args); - })); -} - -exports.aCallAll = function (hook_name, args, cb) { - if (plugins.hooks[hook_name] === undefined) cb([]); - async.map( - plugins.hooks[hook_name], - function (hook, cb) { - hookCallWrapper(hook, hook_name, args, function (res) { cb(null, res); }); - }, - function (err, res) { - cb(exports.flatten(res)); - } - ); -} - -exports.callFirst = function (hook_name, args) { - if (plugins.hooks[hook_name][0] === undefined) return []; - return exports.flatten(hookCallWrapper(plugins.hooks[hook_name][0], hook_name, args)); -} - -exports.aCallFirst = function (hook_name, args, cb) { - if (plugins.hooks[hook_name][0] === undefined) cb([]); - hookCallWrapper(plugins.hooks[hook_name][0], hook_name, args, function (res) { cb(exports.flatten(res)); }); -} diff --git a/src/node/pluginfw/plugins.js b/src/node/pluginfw/plugins.js deleted file mode 100644 index e9194c4a..00000000 --- a/src/node/pluginfw/plugins.js +++ /dev/null @@ -1,160 +0,0 @@ -var npm = require("npm/lib/npm.js"); -var readInstalled = require("npm/lib/utils/read-installed.js"); -var relativize = require("npm/lib/utils/relativize.js"); -var readJson = require("npm/lib/utils/read-json.js"); -var path = require("path"); -var async = require("async"); -var fs = require("fs"); -var tsort = require("./tsort"); -var util = require("util"); - -exports.prefix = 'ep_'; -exports.loaded = false; -exports.plugins = {}; -exports.parts = []; -exports.hooks = {}; - -exports.ensure = function (cb) { - if (!exports.loaded) - exports.update(cb); - else - cb(); -} - -exports.formatPlugins = function () { - return Object.keys(exports.plugins).join(", "); -} - -exports.formatParts = function () { - return exports.parts.map(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) { - res.push(hook.hook_name + ": " + hook.hook_fn_name + " from " + hook.part.full_name); - }); - }); - return res.join("\n"); -} - -exports.update = function (cb) { - exports.getPackages(function (er, packages) { - var parts = []; - var plugins = {}; - // Load plugin metadata ep.json - async.forEach( - Object.keys(packages), - function (plugin_name, cb) { - exports.loadPlugin(packages, plugin_name, plugins, parts, cb); - }, - function (err) { - exports.plugins = plugins; - exports.parts = exports.sortParts(parts); - exports.hooks = exports.extractHooks(exports.parts); - exports.loaded = true; - cb(err); - } - ); - }); -} - -exports.getPackages = function (cb) { - // Load list of installed NPM packages, flatten it to a list, and filter out only packages with names that - var dir = path.resolve(npm.dir, '..'); - readInstalled(dir, function (er, data) { - if (er) cb(er, null); - var packages = {}; - function flatten(deps) { - Object.keys(deps).forEach(function (name) { - if (name.indexOf(exports.prefix) == 0) { - packages[name] = deps[name]; - } - if (deps[name].dependencies !== undefined) - flatten(deps[name].dependencies); - delete deps[name].dependencies; - }); - } - flatten([data]); - cb(null, packages); - }); -} - -exports.extractHooks = function (parts) { - var hooks = {}; - parts.forEach(function (part) { - Object.keys(part.hooks || {}).forEach(function (hook_name) { - if (hooks[hook_name] === undefined) hooks[hook_name] = []; - var hook_fn_name = part.hooks[hook_name]; - var hook_fn = exports.loadFn(part.hooks[hook_name]); - if (hook_fn) { - hooks[hook_name].push({"hook_name": hook_name, "hook_fn": hook_fn, "hook_fn_name": hook_fn_name, "part": part}); - } else { - console.error("Unable to load hook function for " + part.full_name + " for hook " + hook_name + ": " + part.hooks[hook_name]); - } - }); - }); - return hooks; -} - -exports.loadPlugin = function (packages, plugin_name, plugins, parts, cb) { - var plugin_path = path.resolve(packages[plugin_name].path, "ep.json"); - fs.readFile( - plugin_path, - function (er, data) { - if (er) { - console.error("Unable to load plugin definition file " + plugin_path); - return cb(); - } - try { - var plugin = JSON.parse(data); - plugin.package = packages[plugin_name]; - plugins[plugin_name] = plugin; - plugin.parts.forEach(function (part) { - part.plugin = plugin_name; - part.full_name = plugin_name + "/" + part.name; - parts[part.full_name] = part; - }); - } catch (ex) { - console.error("Unable to parse plugin definition file " + plugin_path + ": " + ex.toString()); - } - cb(); - } - ); -} - -exports.partsToParentChildList = function (parts) { - var res = []; - Object.keys(parts).forEach(function (name) { - (parts[name].post || []).forEach(function (child_name) { - res.push([name, child_name]); - }); - (parts[name].pre || []).forEach(function (parent_name) { - res.push([parent_name, name]); - }); - if (!parts[name].pre && !parts[name].post) { - res.push([name, ":" + name]); // Include apps with no dependency info - } - }); - return res; -} - -exports.sortParts = function(parts) { - return tsort( - exports.partsToParentChildList(parts) - ).filter( - function (name) { return parts[name] !== undefined; } - ).map( - function (name) { return parts[name]; } - ); -}; - -exports.loadFn = function (path) { - var x = path.split(":"); - var fn = require(x[0]); - x[1].split(".").forEach(function (name) { - fn = fn[name]; - }); - return fn; -} diff --git a/src/node/pluginfw/require.js b/src/node/pluginfw/require.js deleted file mode 100644 index 8d64cbd6..00000000 --- a/src/node/pluginfw/require.js +++ /dev/null @@ -1,42 +0,0 @@ -var plugins = require('./plugins'); -var path = require('path'); - -var SERVER_JS_SRC = path.normalize(path.join(__dirname, '../../')); -var CLIENT_JS_SRC = path.normalize(path.join(__dirname, '../../static/js')); - -global.ep_require = function (url) { - if (url.indexOf("/plugins/") == 0) { - /* Handle paths like "/plugins/ep_myplugin/test.js" - by rewriting it to ROOT_PATH_OF_MYPLUGIN/test.js, - commonly ETHERPAD_ROOT/node_modules/ep_myplugin/test.js - */ - url = url.split("/"); - url.splice(0, 1); - var plugin_name = url.splice(0, 1)[0]; - url = url.join("/"); - url = path.normalize(path.join(plugins.plugins[plugin_name].package.path, url)); - } else if (url.indexOf("/") == 0) { - /* Handle all non-plugin paths for files in / */ - url = path.normalize(path.join(SERVER_JS_SRC, url)) - } - return require(url); -} - -global.ep_client_require = function (url) { - if (url.indexOf("/plugins/") == 0) { - /* Handle paths like "/plugins/ep_myplugin/test.js" - by rewriting it to ROOT_PATH_OF_MYPLUGIN/static/js/test.js, - commonly ETHERPAD_ROOT/node_modules/ep_myplugin/static/js/test.js - For more information see hooks/express/static.js - */ - url = url.split("/"); - url.splice(0, 2); - var plugin_name = url.splice(0, 1)[0]; - url = url.join("/"); - url = path.normalize(path.join(plugins.plugins[plugin_name].package.path, "static/js", url)); - } else if (url.indexOf("/") == 0) { - /* Handle all non-plugin paths for files in /static */ - url = path.normalize(path.join(CLIENT_JS_SRC, url)) - } - return require(url); -} diff --git a/src/node/server.js b/src/node/server.js index d40f6807..489cae74 100644 --- a/src/node/server.js +++ b/src/node/server.js @@ -27,8 +27,8 @@ var db = require('./db/DB'); var async = require('async'); var express = require('express'); var path = require('path'); -var plugins = require("./pluginfw/plugins"); -var hooks = require("./pluginfw/hooks"); +var plugins = require("ep_etherpad-lite/static/js/pluginfw/plugins"); +var hooks = require("ep_etherpad-lite/static/js/pluginfw/hooks"); var npm = require("npm/lib/npm.js"); //try to get the git version diff --git a/src/node/pluginfw/tsort.js b/src/static/js/pluginfw/tsort.js similarity index 100% rename from src/node/pluginfw/tsort.js rename to src/static/js/pluginfw/tsort.js From df531a7b2bf115f51f2a3bb41f30d2e078bbd55f Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Thu, 1 Mar 2012 19:22:02 +0100 Subject: [PATCH 049/297] Made ace actually use the new hooks system, and removed remnants of old system --- src/static/js/ace.js | 4 ++-- src/static/js/contentcollector.js | 8 +++---- src/static/js/domline.js | 6 ++--- src/static/js/linestylefilter.js | 10 +++------ src/static/js/pluginfw/hooks.js | 12 ++++++++++ src/static/js/plugins.js | 37 ------------------------------- 6 files changed, 22 insertions(+), 55 deletions(-) delete mode 100644 src/static/js/plugins.js diff --git a/src/static/js/ace.js b/src/static/js/ace.js index 7022b1c5..78ff098a 100644 --- a/src/static/js/ace.js +++ b/src/static/js/ace.js @@ -28,7 +28,7 @@ Ace2Editor.registry = { nextId: 1 }; -var plugins = require('ep_etherpad-lite/static/js/plugins').plugins; +var hooks = require('ep_etherpad-lite/static/js/pluginfw/hooks'); function Ace2Editor() { @@ -300,7 +300,7 @@ function Ace2Editor() for (var i = 0, ii = iframeHTML.length; i < ii; i++) { iframeHTML[i] = JSON.stringify(iframeHTML[i]); } - plugins.callHook("aceInitInnerdocbodyHead", { + hooks.callAll("aceInitInnerdocbodyHead", { iframeHTML: iframeHTML }); for (var i = 0, ii = iframeHTML.length; i < ii; i++) { diff --git a/src/static/js/contentcollector.js b/src/static/js/contentcollector.js index 76b20c92..f66f01a6 100644 --- a/src/static/js/contentcollector.js +++ b/src/static/js/contentcollector.js @@ -26,7 +26,7 @@ var _MAX_LIST_LEVEL = 8; var Changeset = require('ep_etherpad-lite/static/js/Changeset'); -var plugins = require('ep_etherpad-lite/static/js/plugins').plugins; +var hooks = require('ep_etherpad-lite/static/js/pluginfw/hooks'); function sanitizeUnicode(s) { @@ -37,8 +37,6 @@ function makeContentCollector(collectStyles, browser, apool, domInterface, class { browser = browser || {}; - var plugins_ = plugins; - var dom = domInterface || { isNodeText: function(n) { @@ -448,7 +446,7 @@ function makeContentCollector(collectStyles, browser, apool, domInterface, class var oldAuthorOrNull = null; if (collectStyles) { - plugins_.callHook('collectContentPre', { + hooks.callAll('collectContentPre', { cc: cc, state: state, tname: tname, @@ -510,7 +508,7 @@ function makeContentCollector(collectStyles, browser, apool, domInterface, class if (collectStyles) { - plugins_.callHook('collectContentPost', { + hooks.callAll('collectContentPost', { cc: cc, state: state, tname: tname, diff --git a/src/static/js/domline.js b/src/static/js/domline.js index 71ad2c52..3df98dc0 100644 --- a/src/static/js/domline.js +++ b/src/static/js/domline.js @@ -27,7 +27,7 @@ // requires: undefined var Security = require('ep_etherpad-lite/static/js/security'); -var plugins = require('ep_etherpad-lite/static/js/plugins').plugins; +var hooks = require('ep_etherpad-lite/static/js/pluginfw/hooks'); var map = require('ep_etherpad-lite/static/js/ace2_common').map; var domline = {}; @@ -145,9 +145,7 @@ domline.createDomLine = function(nonEmpty, doesWrap, optBrowser, optDocument) var extraOpenTags = ""; var extraCloseTags = ""; - var plugins_ = plugins; - - map(plugins_.callHook("aceCreateDomLine", { + map(hooks.callAll("aceCreateDomLine", { domline: domline, cls: cls }), function(modifier) diff --git a/src/static/js/linestylefilter.js b/src/static/js/linestylefilter.js index b75ac200..e2fa316a 100644 --- a/src/static/js/linestylefilter.js +++ b/src/static/js/linestylefilter.js @@ -29,7 +29,7 @@ // requires: undefined var Changeset = require('ep_etherpad-lite/static/js/Changeset'); -var plugins = require('ep_etherpad-lite/static/js/plugins').plugins; +var hooks = require('ep_etherpad-lite/static/js/pluginfw/hooks'); var map = require('ep_etherpad-lite/static/js/ace2_common').map; var linestylefilter = {}; @@ -55,8 +55,6 @@ linestylefilter.getAuthorClassName = function(author) linestylefilter.getLineStyleFilter = function(lineLength, aline, textAndClassFunc, apool) { - var plugins_ = plugins; - if (lineLength == 0) return textAndClassFunc; var nextAfterAuthorColors = textAndClassFunc; @@ -97,7 +95,7 @@ linestylefilter.getLineStyleFilter = function(lineLength, aline, textAndClassFun } else { - classes += plugins_.callHookStr("aceAttribsToClasses", { + classes += hooks.callAllStr("aceAttribsToClasses", { linestylefilter: linestylefilter, key: key, value: value @@ -300,9 +298,7 @@ linestylefilter.getFilterStack = function(lineText, textAndClassFunc, browser) { var func = linestylefilter.getURLFilter(lineText, textAndClassFunc); - var plugins_ = plugins; - - var hookFilters = plugins_.callHook("aceGetFilterStack", { + var hookFilters = hooks.callAll("aceGetFilterStack", { linestylefilter: linestylefilter, browser: browser }); diff --git a/src/static/js/pluginfw/hooks.js b/src/static/js/pluginfw/hooks.js index 383a2a2c..7141d75f 100644 --- a/src/static/js/pluginfw/hooks.js +++ b/src/static/js/pluginfw/hooks.js @@ -61,3 +61,15 @@ exports.aCallFirst = function (hook_name, args, cb) { if (plugins.hooks[hook_name][0] === undefined) cb([]); hookCallWrapper(plugins.hooks[hook_name][0], hook_name, args, function (res) { cb(exports.flatten(res)); }); } + +exports.callAllStr = function(hook_name, args, sep, pre, post) { + if (sep == undefined) sep = ''; + if (pre == undefined) pre = ''; + if (post == undefined) post = ''; + var newCallhooks = []; + var callhooks = exports.callAll(hook_name, args); + for (var i = 0, ii = callhooks.length; i < ii; i++) { + newCallhooks[i] = pre + callhooks[i] + post; + } + return newCallhooks.join(sep || ""); +} diff --git a/src/static/js/plugins.js b/src/static/js/plugins.js deleted file mode 100644 index 3e226eba..00000000 --- a/src/static/js/plugins.js +++ /dev/null @@ -1,37 +0,0 @@ -/** - * This code is mostly from the old Etherpad. Please help us to comment this code. - * This helps other people to understand this code better and helps them to improve it. - * TL;DR COMMENTS ON THIS FILE ARE HIGHLY APPRECIATED - */ - -var plugins = { - callHook: function(hookName, args) - { - var global = (function () {return this}()); - var hook = ((global.clientVars || {}).hooks || {})[hookName]; - if (hook === undefined) return []; - var res = []; - for (var i = 0, N = hook.length; i < N; i++) - { - var plugin = hook[i]; - var pluginRes = eval(plugin.plugin)[plugin.original || hookName](args); - if (pluginRes != undefined && pluginRes != null) res = res.concat(pluginRes); - } - return res; - }, - - callHookStr: function(hookName, args, sep, pre, post) - { - if (sep == undefined) sep = ''; - if (pre == undefined) pre = ''; - if (post == undefined) post = ''; - var newCallhooks = []; - var callhooks = plugins.callHook(hookName, args); - for (var i = 0, ii = callhooks.length; i < ii; i++) { - newCallhooks[i] = pre + callhooks[i] + post; - } - return newCallhooks.join(sep || ""); - } -}; - -exports.plugins = plugins; From 6cd391d3fb33f5c59fd0d1deaaa18c1034e0bd81 Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Thu, 1 Mar 2012 20:18:03 +0100 Subject: [PATCH 050/297] Fixed timeslider which I broke a few minutes ago --- src/node/utils/tar.json | 2 -- src/static/timeslider.html | 25 +++++++++++++++---------- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/src/node/utils/tar.json b/src/node/utils/tar.json index e922ddde..a905eb44 100644 --- a/src/node/utils/tar.json +++ b/src/node/utils/tar.json @@ -5,7 +5,6 @@ , "pad.js" , "ace2_common.js" , "pad_utils.js" - , "plugins.js" , "undo-xpopup.js" , "json2.js" , "pad_cookie.js" @@ -27,7 +26,6 @@ , "timeslider.js": [ "jquery.js" , "security.js" - , "plugins.js" , "undo-xpopup.js" , "json2.js" , "colorutils.js" diff --git a/src/static/timeslider.html b/src/static/timeslider.html index 391edb73..e807e258 100644 --- a/src/static/timeslider.html +++ b/src/static/timeslider.html @@ -197,21 +197,26 @@ - - - - + + + + + From f6b9b49ab43d5f2fddcd8ddbfcffb0f2fd629e26 Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Fri, 2 Mar 2012 22:02:42 +0100 Subject: [PATCH 051/297] Added the rejected/conflicting files as .rej-files so they're not forgotten but resolved manually --- node/server.js.rej | 500 ++++++++++++++++++++++++++++++++++ src/node/utils/Minify.js.rej | 513 +++++++++++++++++++++++++++++++++++ 2 files changed, 1013 insertions(+) create mode 100644 node/server.js.rej create mode 100644 src/node/utils/Minify.js.rej diff --git a/node/server.js.rej b/node/server.js.rej new file mode 100644 index 00000000..c5377d81 --- /dev/null +++ b/node/server.js.rej @@ -0,0 +1,500 @@ +/** + * This module is started with bin/run.sh. It sets up a Express HTTP and a Socket.IO Server. + * Static file Requests are answered directly from this module, Socket.IO messages are passed + * to MessageHandler and minfied requests are passed to minified. + */ + +/* + * 2011 Peter 'Pita' Martischka (Primary Technology Ltd) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS-IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +var ERR = require("async-stacktrace"); +var log4js = require('log4js'); +var os = require("os"); +var socketio = require('socket.io'); +var fs = require('fs'); +var settings = require('./utils/Settings'); +var db = require('./db/DB'); +var async = require('async'); +var express = require('express'); +var path = require('path'); +var minify = require('./utils/Minify'); +var CachingMiddleware = require('./utils/caching_middleware'); +var Yajsml = require('yajsml'); +var formidable = require('formidable'); +var apiHandler; +var exportHandler; +var importHandler; +var exporthtml; +var readOnlyManager; +var padManager; +var securityManager; +var socketIORouter; + +//try to get the git version +var version = ""; +try +{ + var rootPath = path.normalize(__dirname + "/../") + var ref = fs.readFileSync(rootPath + ".git/HEAD", "utf-8"); + var refPath = rootPath + ".git/" + ref.substring(5, ref.indexOf("\n")); + version = fs.readFileSync(refPath, "utf-8"); + version = version.substring(0, 7); + console.log("Your Etherpad Lite git version is " + version); +} +catch(e) +{ + console.warn("Can't get git version for server header\n" + e.message) +} + +console.log("Report bugs at https://github.com/Pita/etherpad-lite/issues") + +var serverName = "Etherpad-Lite " + version + " (http://j.mp/ep-lite)"; + +exports.maxAge = settings.maxAge; + +//set loglevel +log4js.setGlobalLogLevel(settings.loglevel); + +async.waterfall([ + //initalize the database + function (callback) + { + db.init(callback); + }, + //initalize the http server + function (callback) + { + //create server + var app = express.createServer(); + + app.use(function (req, res, next) { + res.header("Server", serverName); + next(); + }); + + + //redirects browser to the pad's sanitized url if needed. otherwise, renders the html + app.param('pad', function (req, res, next, padId) { + //ensure the padname is valid and the url doesn't end with a / + if(!padManager.isValidPadId(padId) || /\/$/.test(req.url)) + { + res.send('Such a padname is forbidden', 404); + } + else + { + padManager.sanitizePadId(padId, function(sanitizedPadId) { + //the pad id was sanitized, so we redirect to the sanitized version + if(sanitizedPadId != padId) + { + var real_path = req.path.replace(/^\/p\/[^\/]+/, './' + sanitizedPadId); + res.header('Location', real_path); + res.send('You should be redirected to ' + real_path + '', 302); + } + //the pad id was fine, so just render it + else + { + next(); + } + }); + } + }); + + //load modules that needs a initalized db + readOnlyManager = require("./db/ReadOnlyManager"); + exporthtml = require("./utils/ExportHtml"); + exportHandler = require('./handler/ExportHandler'); + importHandler = require('./handler/ImportHandler'); + apiHandler = require('./handler/APIHandler'); + padManager = require('./db/PadManager'); + securityManager = require('./db/SecurityManager'); + socketIORouter = require("./handler/SocketIORouter"); + + //install logging + var httpLogger = log4js.getLogger("http"); + app.configure(function() + { + // Activate http basic auth if it has been defined in settings.json + if(settings.httpAuth != null) app.use(basic_auth); + + // If the log level specified in the config file is WARN or ERROR the application server never starts listening to requests as reported in issue #158. + // Not installing the log4js connect logger when the log level has a higher severity than INFO since it would not log at that level anyway. + if (!(settings.loglevel === "WARN" || settings.loglevel == "ERROR")) + app.use(log4js.connectLogger(httpLogger, { level: log4js.levels.INFO, format: ':status, :method :url'})); + app.use(express.cookieParser()); + }); + + app.error(function(err, req, res, next){ + res.send(500); + console.error(err.stack ? err.stack : err.toString()); + gracefulShutdown(); + }); + + // Cache both minified and static. + var assetCache = new CachingMiddleware; + app.all('/(minified|static)/*', assetCache.handle); + + // Minify will serve static files compressed (minify enabled). It also has + // file-specific hacks for ace/require-kernel/etc. + app.all('/static/:filename(*)', minify.minify); + + // Setup middleware that will package JavaScript files served by minify for + // CommonJS loader on the client-side. + var jsServer = new (Yajsml.Server)({ + rootPath: 'minified/' + , rootURI: 'http://localhost:' + settings.port + '/static/js/' + }); + var StaticAssociator = Yajsml.associators.StaticAssociator; + var associations = + Yajsml.associators.associationsForSimpleMapping(minify.tar); + var associator = new StaticAssociator(associations); + jsServer.setAssociator(associator); + app.use(jsServer); + + //checks for padAccess + function hasPadAccess(req, res, callback) + { + securityManager.checkAccess(req.params.pad, req.cookies.sessionid, req.cookies.token, req.cookies.password, function(err, accessObj) + { + if(ERR(err, callback)) return; + + //there is access, continue + if(accessObj.accessStatus == "grant") + { + callback(); + } + //no access + else + { + res.send("403 - Can't touch this", 403); + } + }); + } + + //checks for basic http auth + function basic_auth (req, res, next) { + if (req.headers.authorization && req.headers.authorization.search('Basic ') === 0) { + // fetch login and password + if (new Buffer(req.headers.authorization.split(' ')[1], 'base64').toString() == settings.httpAuth) { + next(); + return; + } + } + + res.header('WWW-Authenticate', 'Basic realm="Protected Area"'); + if (req.headers.authorization) { + setTimeout(function () { + res.send('Authentication required', 401); + }, 1000); + } else { + res.send('Authentication required', 401); + } + } + + //serve read only pad + app.get('/ro/:id', function(req, res) + { + var html; + var padId; + var pad; + + async.series([ + //translate the read only pad to a padId + function(callback) + { + readOnlyManager.getPadId(req.params.id, function(err, _padId) + { + if(ERR(err, callback)) return; + + padId = _padId; + + //we need that to tell hasPadAcess about the pad + req.params.pad = padId; + + callback(); + }); + }, + //render the html document + function(callback) + { + //return if the there is no padId + if(padId == null) + { + callback("notfound"); + return; + } + + hasPadAccess(req, res, function() + { + //render the html document + exporthtml.getPadHTMLDocument(padId, null, false, function(err, _html) + { + if(ERR(err, callback)) return; + html = _html; + callback(); + }); + }); + } + ], function(err) + { + //throw any unexpected error + if(err && err != "notfound") + ERR(err); + + if(err == "notfound") + res.send('404 - Not Found', 404); + else + res.send(html); + }); + }); + + //serve pad.html under /p + app.get('/p/:pad', function(req, res, next) + { + var filePath = path.normalize(__dirname + "/../static/pad.html"); + res.sendfile(filePath, { maxAge: exports.maxAge }); + }); + + //serve timeslider.html under /p/$padname/timeslider + app.get('/p/:pad/timeslider', function(req, res, next) + { + var filePath = path.normalize(__dirname + "/../static/timeslider.html"); + res.sendfile(filePath, { maxAge: exports.maxAge }); + }); + + //serve timeslider.html under /p/$padname/timeslider + app.get('/p/:pad/:rev?/export/:type', function(req, res, next) + { + var types = ["pdf", "doc", "txt", "html", "odt", "dokuwiki"]; + //send a 404 if we don't support this filetype + if(types.indexOf(req.params.type) == -1) + { + next(); + return; + } + + //if abiword is disabled, and this is a format we only support with abiword, output a message + if(settings.abiword == null && + ["odt", "pdf", "doc"].indexOf(req.params.type) !== -1) + { + res.send("Abiword is not enabled at this Etherpad Lite instance. Set the path to Abiword in settings.json to enable this feature"); + return; + } + + res.header("Access-Control-Allow-Origin", "*"); + + hasPadAccess(req, res, function() + { + exportHandler.doExport(req, res, req.params.pad, req.params.type); + }); + }); + + //handle import requests + app.post('/p/:pad/import', function(req, res, next) + { + //if abiword is disabled, skip handling this request + if(settings.abiword == null) + { + next(); + return; + } + + hasPadAccess(req, res, function() + { + importHandler.doImport(req, res, req.params.pad); + }); + }); + + var apiLogger = log4js.getLogger("API"); + + //This is for making an api call, collecting all post information and passing it to the apiHandler + var apiCaller = function(req, res, fields) + { + res.header("Content-Type", "application/json; charset=utf-8"); + + apiLogger.info("REQUEST, " + req.params.func + ", " + JSON.stringify(fields)); + + //wrap the send function so we can log the response + res._send = res.send; + res.send = function(response) + { + response = JSON.stringify(response); + apiLogger.info("RESPONSE, " + req.params.func + ", " + response); + + //is this a jsonp call, if yes, add the function call + if(req.query.jsonp) + response = req.query.jsonp + "(" + response + ")"; + + res._send(response); + } + + //call the api handler + apiHandler.handle(req.params.func, fields, req, res); + } + + //This is a api GET call, collect all post informations and pass it to the apiHandler + app.get('/api/1/:func', function(req, res) + { + apiCaller(req, res, req.query) + }); + + //This is a api POST call, collect all post informations and pass it to the apiHandler + app.post('/api/1/:func', function(req, res) + { + new formidable.IncomingForm().parse(req, function(err, fields, files) + { + apiCaller(req, res, fields) + }); + }); + + //The Etherpad client side sends information about how a disconnect happen + app.post('/ep/pad/connection-diagnostic-info', function(req, res) + { + new formidable.IncomingForm().parse(req, function(err, fields, files) + { + console.log("DIAGNOSTIC-INFO: " + fields.diagnosticInfo); + res.end("OK"); + }); + }); + + //The Etherpad client side sends information about client side javscript errors + app.post('/jserror', function(req, res) + { + new formidable.IncomingForm().parse(req, function(err, fields, files) + { + console.error("CLIENT SIDE JAVASCRIPT ERROR: " + fields.errorInfo); + res.end("OK"); + }); + }); + + //serve index.html under / + app.get('/', function(req, res) + { + var filePath = path.normalize(__dirname + "/../static/index.html"); + res.sendfile(filePath, { maxAge: exports.maxAge }); + }); + + //serve robots.txt + app.get('/robots.txt', function(req, res) + { + var filePath = path.normalize(__dirname + "/../static/robots.txt"); + res.sendfile(filePath, { maxAge: exports.maxAge }); + }); + + //serve favicon.ico + app.get('/favicon.ico', function(req, res) + { + var filePath = path.normalize(__dirname + "/../static/custom/favicon.ico"); + res.sendfile(filePath, { maxAge: exports.maxAge }, function(err) + { + //there is no custom favicon, send the default favicon + if(err) + { + filePath = path.normalize(__dirname + "/../static/favicon.ico"); + res.sendfile(filePath, { maxAge: exports.maxAge }); + } + }); + }); + + //let the server listen + app.listen(settings.port, settings.ip); + console.log("Server is listening at " + settings.ip + ":" + settings.port); + + var onShutdown = false; + var gracefulShutdown = function(err) + { + if(err && err.stack) + { + console.error(err.stack); + } + else if(err) + { + console.error(err); + } + + //ensure there is only one graceful shutdown running + if(onShutdown) return; + onShutdown = true; + + console.log("graceful shutdown..."); + + //stop the http server + app.close(); + + //do the db shutdown + db.db.doShutdown(function() + { + console.log("db sucessfully closed."); + + process.exit(0); + }); + + setTimeout(function(){ + process.exit(1); + }, 3000); + } + + //connect graceful shutdown with sigint and uncaughtexception + if(os.type().indexOf("Windows") == -1) + { + //sigint is so far not working on windows + //https://github.com/joyent/node/issues/1553 + process.on('SIGINT', gracefulShutdown); + } + + process.on('uncaughtException', gracefulShutdown); + + //init socket.io and redirect all requests to the MessageHandler + var io = socketio.listen(app); + + //this is only a workaround to ensure it works with all browers behind a proxy + //we should remove this when the new socket.io version is more stable + io.set('transports', ['xhr-polling']); + + var socketIOLogger = log4js.getLogger("socket.io"); + io.set('logger', { + debug: function (str) + { + socketIOLogger.debug.apply(socketIOLogger, arguments); + }, + info: function (str) + { + socketIOLogger.info.apply(socketIOLogger, arguments); + }, + warn: function (str) + { + socketIOLogger.warn.apply(socketIOLogger, arguments); + }, + error: function (str) + { + socketIOLogger.error.apply(socketIOLogger, arguments); + }, + }); + + //minify socket.io javascript + if(settings.minify) + io.enable('browser client minification'); + + var padMessageHandler = require("./handler/PadMessageHandler"); + var timesliderMessageHandler = require("./handler/TimesliderMessageHandler"); + + //Initalize the Socket.IO Router + socketIORouter.setSocketIO(io); + socketIORouter.addComponent("pad", padMessageHandler); + socketIORouter.addComponent("timeslider", timesliderMessageHandler); + + callback(null); + } +]); diff --git a/src/node/utils/Minify.js.rej b/src/node/utils/Minify.js.rej new file mode 100644 index 00000000..f09f49dc --- /dev/null +++ b/src/node/utils/Minify.js.rej @@ -0,0 +1,513 @@ +/** + * This Module manages all /minified/* requests. It controls the + * minification && compression of Javascript and CSS. + */ + +/* + * 2011 Peter 'Pita' Martischka (Primary Technology Ltd) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS-IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +var ERR = require("async-stacktrace"); +var settings = require('./Settings'); +var async = require('async'); +var fs = require('fs'); +var cleanCSS = require('clean-css'); +var jsp = require("uglify-js").parser; +var pro = require("uglify-js").uglify; +var path = require('path'); +var RequireKernel = require('require-kernel'); +var server = require('../server'); + +<<<<<<< HEAD +var ROOT_DIR = path.normalize(__dirname + "/../" ); +var JS_DIR = ROOT_DIR + '../static/js/'; +var CSS_DIR = ROOT_DIR + '../static/css/'; +var CACHE_DIR = path.join(settings.root, 'var'); +======= +var ROOT_DIR = path.normalize(__dirname + "/../../static/"); +>>>>>>> pita +var TAR_PATH = path.join(__dirname, 'tar.json'); +var tar = JSON.parse(fs.readFileSync(TAR_PATH, 'utf8')); + +// Rewrite tar to include modules with no extensions and proper rooted paths. +exports.tar = {}; +for (var key in tar) { + exports.tar['/' + key] = + tar[key].map(function (p) {return '/' + p}).concat( + tar[key].map(function (p) {return '/' + p.replace(/\.js$/, '')}) + ); +} + +/** + * creates the minifed javascript for the given minified name + * @param req the Express request + * @param res the Express response + */ +exports.minify = function(req, res, next) +{ +<<<<<<< HEAD + var jsFilename = req.params[0]; + + //choose the js files we need + var jsFiles = undefined; + if (Object.prototype.hasOwnProperty.call(tar, jsFilename)) { + jsFiles = tar[jsFilename]; + } else { + /* Not in tar list, but try anyways, if it fails, pass to `next`. + Actually try, not check in filesystem here because + we don't want to duplicate the require.resolve() handling + */ + jsFiles = [jsFilename]; + } + _handle(req, res, jsFilename, jsFiles, function (err) { + console.log("Unable to load minified file " + jsFilename + ": " + err.toString()); + /* Throw away error and generate a 404, not 500 */ + next(); + }); +} + +function _handle(req, res, jsFilename, jsFiles, next) { + res.header("Content-Type","text/javascript"); + + var cacheName = CACHE_DIR + "/minified_" + jsFilename.replace(/\//g, "_"); + + //minifying is enabled + if(settings.minify) + { + var result = undefined; + var latestModification = 0; + + async.series([ + //find out the highest modification date + function(callback) + { + var folders2check = [CSS_DIR, JS_DIR]; + + //go trough this two folders + async.forEach(folders2check, function(path, callback) + { + //read the files in the folder + fs.readdir(path, function(err, files) + { + if(ERR(err, callback)) return; + + //we wanna check the directory itself for changes too + files.push("."); + + //go trough all files in this folder + async.forEach(files, function(filename, callback) + { + //get the stat data of this file + fs.stat(path + "/" + filename, function(err, stats) + { + if(ERR(err, callback)) return; + + //get the modification time + var modificationTime = stats.mtime.getTime(); + + //compare the modification time to the highest found + if(modificationTime > latestModification) + { + latestModification = modificationTime; + } + + callback(); + }); + }, callback); + }); + }, callback); + }, + function(callback) + { + //check the modification time of the minified js + fs.stat(cacheName, function(err, stats) + { + if(err && err.code != "ENOENT") + { + ERR(err, callback); + return; + } + + //there is no minfied file or there new changes since this file was generated, so continue generating this file + if((err && err.code == "ENOENT") || stats.mtime.getTime() < latestModification) + { + callback(); + } + //the minified file is still up to date, stop minifying + else + { + callback("stop"); + } + }); + }, + //load all js files + function (callback) + { + var values = []; + tarCode( + jsFiles + , function (content) {values.push(content)} + , function (err) { + if(ERR(err, next)) return; + + result = values.join(''); + callback(); + }); + }, + //put all together and write it into a file + function(callback) + { + async.parallel([ + //write the results plain in a file + function(callback) + { + fs.writeFile(cacheName, result, "utf8", callback); + }, + //write the results compressed in a file + function(callback) + { + zlib.gzip(result, function(err, compressedResult){ + //weird gzip bug that returns 0 instead of null if everything is ok + err = err === 0 ? null : err; + + if(ERR(err, callback)) return; + + fs.writeFile(cacheName + ".gz", compressedResult, callback); + }); + } + ],callback); + } + ], function(err) + { + if(err && err != "stop") + { + if(ERR(err)) return; + } + + //check if gzip is supported by this browser + var gzipSupport = req.header('Accept-Encoding', '').indexOf('gzip') != -1; + + var pathStr; + if(gzipSupport && os.type().indexOf("Windows") == -1) + { + pathStr = path.normalize(cacheName + ".gz"); + res.header('Content-Encoding', 'gzip'); + } + else + { + pathStr = path.normalize(cacheName); + } + + res.sendfile(pathStr, { maxAge: server.maxAge }); + }) + } + //minifying is disabled, so put the files together in one file + else + { + tarCode( + jsFiles + , function (content) {res.write(content)} + , function (err) { + if(ERR(err, next)) return; +======= + var filename = req.params['filename']; + + // No relative paths, especially if they may go up the file hierarchy. + filename = path.normalize(path.join(ROOT_DIR, filename)); + if (filename.indexOf(ROOT_DIR) == 0) { + filename = filename.slice(ROOT_DIR.length); + filename = filename.replace(/\\/g, '/'); // Windows (safe generally?) + } else { + res.writeHead(404, {}); + res.end(); + return; + } + + // What content type should this be? + // TODO: This should use a MIME module. + var contentType; + if (filename.match(/\.js$/)) { + contentType = "text/javascript"; + } else if (filename.match(/\.css$/)) { + contentType = "text/css"; + } else if (filename.match(/\.html$/)) { + contentType = "text/html"; + } else if (filename.match(/\.txt$/)) { + contentType = "text/plain"; + } else if (filename.match(/\.png$/)) { + contentType = "image/png"; + } else if (filename.match(/\.gif$/)) { + contentType = "image/gif"; + } else if (filename.match(/\.ico$/)) { + contentType = "image/x-icon"; + } else { + contentType = "application/octet-stream"; + } + + statFile(filename, function (error, date, exists) { + if (date) { + date = new Date(date); + res.setHeader('last-modified', date.toUTCString()); + res.setHeader('date', (new Date()).toUTCString()); + if (server.maxAge) { + var expiresDate = new Date((new Date()).getTime()+server.maxAge*1000); + res.setHeader('expires', expiresDate.toUTCString()); + res.setHeader('cache-control', 'max-age=' + server.maxAge); + } + } + + if (error) { + res.writeHead(500, {}); +>>>>>>> pita + res.end(); + } else if (!exists) { + res.writeHead(404, {}); + res.end(); + } else if (new Date(req.headers['if-modified-since']) >= date) { + res.writeHead(304, {}); + res.end(); + } else { + if (req.method == 'HEAD') { + res.header("Content-Type", contentType); + res.writeHead(200, {}); + res.end(); + } else if (req.method == 'GET') { + getFileCompressed(filename, contentType, function (error, content) { + if(ERR(error)) return; + res.header("Content-Type", contentType); + res.writeHead(200, {}); + res.write(content); + res.end(); + }); + } else { + res.writeHead(405, {'allow': 'HEAD, GET'}); + res.end(); + } + } + }); +} + +// find all includes in ace.js and embed them. +function getAceFile(callback) { + fs.readFile(ROOT_DIR + 'js/ace.js', "utf8", function(err, data) { + if(ERR(err, callback)) return; + + // Find all includes in ace.js and embed them + var founds = data.match(/\$\$INCLUDE_[a-zA-Z_]+\("[^"]*"\)/gi); + if (!settings.minify) { + founds = []; + } + // Always include the require kernel. + founds.push('$$INCLUDE_JS("../static/js/require-kernel.js")'); + + data += ';\n'; + data += 'Ace2Editor.EMBEDED = Ace2Editor.EMBEDED || {};\n'; + + // Request the contents of the included file on the server-side and write + // them into the file. + async.forEach(founds, function (item, callback) { + var filename = item.match(/"([^"]*)"/)[1]; + var request = require('request'); + + var baseURI = 'http://localhost:' + settings.port + + request(baseURI + path.normalize(path.join('/static/', filename)), function (error, response, body) { + if (!error && response.statusCode == 200) { + data += 'Ace2Editor.EMBEDED[' + JSON.stringify(filename) + '] = ' + + JSON.stringify(body || '') + ';\n'; + } else { + // Silence? + } + callback(); + }); + }, function(error) { + callback(error, data); + }); + }); +} + +// Check for the existance of the file and get the last modification date. +function statFile(filename, callback) { + if (filename == 'js/ace.js') { + // Sometimes static assets are inlined into this file, so we have to stat + // everything. + lastModifiedDateOfEverything(function (error, date) { + callback(error, date, !error); + }); + } else if (filename == 'js/require-kernel.js') { + callback(null, requireLastModified(), true); + } else { + fs.stat(ROOT_DIR + filename, function (error, stats) { + if (error) { + if (error.code == "ENOENT") { + // Stat the directory instead. + fs.stat(path.dirname(ROOT_DIR + filename), function (error, stats) { + if (error) { + if (error.code == "ENOENT") { + callback(null, null, false); + } else { + callback(error); + } + } else { + callback(null, stats.mtime.getTime(), false); + } + }); + } else { + callback(error); + } + } else { + callback(null, stats.mtime.getTime(), true); + } + }); + } +} +function lastModifiedDateOfEverything(callback) { + var folders2check = [ROOT_DIR + 'js/', ROOT_DIR + 'css/']; + var latestModification = 0; + //go trough this two folders + async.forEach(folders2check, function(path, callback) + { + //read the files in the folder + fs.readdir(path, function(err, files) + { + if(ERR(err, callback)) return; + + //we wanna check the directory itself for changes too + files.push("."); + + //go trough all files in this folder + async.forEach(files, function(filename, callback) + { + //get the stat data of this file + fs.stat(path + "/" + filename, function(err, stats) + { + if(ERR(err, callback)) return; + + //get the modification time + var modificationTime = stats.mtime.getTime(); + + //compare the modification time to the highest found + if(modificationTime > latestModification) + { + latestModification = modificationTime; + } + + callback(); + }); + }, callback); + }); + }, function () { + callback(null, latestModification); + }); +} + +// This should be provided by the module, but until then, just use startup +// time. +var _requireLastModified = new Date(); +function requireLastModified() { + return _requireLastModified.toUTCString(); +} +function requireDefinition() { + return 'var require = ' + RequireKernel.kernelSource + ';\n'; +} + +<<<<<<< HEAD +function tarCode(jsFiles, write, callback) { + write('require.define({'); + var initialEntry = true; + async.forEach(jsFiles, function (filename, callback){ + var path; + var srcPath; + if (filename.indexOf('plugins/') == 0) { + srcPath = filename.substring('plugins/'.length); + path = require.resolve(srcPath); + } else { + srcPath = '/' + filename; + path = JS_DIR + filename; + } + + srcPath = JSON.stringify(srcPath); + var srcPathAbbv = JSON.stringify(srcPath.replace(/\.js$/, '')); + + if (filename == 'ace.js') { + getAceFile(handleFile); + } else { + fs.readFile(path, "utf8", handleFile); + } + + function handleFile(err, data) { + if(ERR(err, callback)) return; + + if (!initialEntry) { + write('\n,'); + } else { + initialEntry = false; + } + write(srcPath + ': ') + data = '(function (require, exports, module) {' + data + '})'; +======= +function getFileCompressed(filename, contentType, callback) { + getFile(filename, function (error, content) { + if (error || !content) { + callback(error, content); + } else { +>>>>>>> pita + if (settings.minify) { + if (contentType == 'text/javascript') { + try { + content = compressJS([content]); + } catch (error) { + // silence + } + } else if (contentType == 'text/css') { + content = compressCSS([content]); + } + } + callback(null, content); + } +<<<<<<< HEAD + }, function (err) { + if(ERR(err, callback)) return; + write('});\n'); + callback(); +======= +>>>>>>> pita + }); +} + +function getFile(filename, callback) { + if (filename == 'js/ace.js') { + getAceFile(callback); + } else if (filename == 'js/require-kernel.js') { + callback(undefined, requireDefinition()); + } else { + fs.readFile(ROOT_DIR + filename, callback); + } +} + +function compressJS(values) +{ + var complete = values.join("\n"); + var ast = jsp.parse(complete); // parse code and get the initial AST + ast = pro.ast_mangle(ast); // get a new AST with mangled names + ast = pro.ast_squeeze(ast); // get an AST with compression optimizations + return pro.gen_code(ast); // compressed code here +} + +function compressCSS(values) +{ + var complete = values.join("\n"); + return cleanCSS.process(complete); +} From 935edbf892f6f2dc3b67344850dbcf21478ee26a Mon Sep 17 00:00:00 2001 From: Peter 'Pita' Martischka Date: Sun, 4 Mar 2012 19:47:35 +0100 Subject: [PATCH 052/297] fix dirty path in settings.json --- settings.json.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.json.template b/settings.json.template index 94a60fd4..6c0ebd38 100644 --- a/settings.json.template +++ b/settings.json.template @@ -13,7 +13,7 @@ "dbType" : "dirty", //the database specific settings "dbSettings" : { - "filename" : "../var/dirty.db" + "filename" : "var/dirty.db" }, /* An Example of MySQL Configuration From 4e78a6b9cc327a811d352240e3232d026b24b460 Mon Sep 17 00:00:00 2001 From: Peter 'Pita' Martischka Date: Sun, 4 Mar 2012 19:50:05 +0100 Subject: [PATCH 053/297] Fix gitignore for custom files --- src/static/custom/.gitignore | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 src/static/custom/.gitignore diff --git a/src/static/custom/.gitignore b/src/static/custom/.gitignore new file mode 100644 index 00000000..aae16bb2 --- /dev/null +++ b/src/static/custom/.gitignore @@ -0,0 +1,3 @@ +* +!.gitignore +!*.template From 5396cd68db9d2a50bfdb321adef495089340f3dd Mon Sep 17 00:00:00 2001 From: Peter 'Pita' Martischka Date: Sun, 4 Mar 2012 19:50:52 +0100 Subject: [PATCH 054/297] Fix dirty path for windows --- settings.json.template_windows | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.json.template_windows b/settings.json.template_windows index 61f14dce..da661fca 100644 --- a/settings.json.template_windows +++ b/settings.json.template_windows @@ -12,7 +12,7 @@ "dbType" : "dirty", //the database specific settings "dbSettings" : { - "filename" : "../var/dirty.db" + "filename" : "var/dirty.db" }, /* An Example of MySQL Configuration From 9f03e5ec68b9a999e0a428dbc695e7134848e131 Mon Sep 17 00:00:00 2001 From: Peter 'Pita' Martischka Date: Sun, 4 Mar 2012 20:32:57 +0100 Subject: [PATCH 055/297] Output nicer exceptions in hook call --- src/static/js/pluginfw/hooks.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/static/js/pluginfw/hooks.js b/src/static/js/pluginfw/hooks.js index 7141d75f..1b09a6e5 100644 --- a/src/static/js/pluginfw/hooks.js +++ b/src/static/js/pluginfw/hooks.js @@ -12,7 +12,7 @@ var hookCallWrapper = function (hook, hook_name, args, cb) { try { return hook.hook_fn(hook_name, args, cb); } catch (ex) { - console.error([hook_name, hook.part.full_name, ex]); + console.error([hook_name, hook.part.full_name, ex.stack || ex]); } } From 0e110efe9e3d3300f408974b91a2161ac86c1cf6 Mon Sep 17 00:00:00 2001 From: Peter 'Pita' Martischka Date: Sun, 4 Mar 2012 21:06:37 +0100 Subject: [PATCH 056/297] fix debugRun --- bin/debugRun.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/bin/debugRun.sh b/bin/debugRun.sh index 28f763ce..f90009d0 100755 --- a/bin/debugRun.sh +++ b/bin/debugRun.sh @@ -22,7 +22,6 @@ node-inspector & echo "If you are new to node-inspector, take a look at this video: http://youtu.be/AOnK3NVnxL8" -cd "node" node --debug node_modules/ep_etherpad-lite/node/server.js $* #kill node-inspector before ending From 8b5925440ad21d7e127c2fa4e80bd4ddb6965597 Mon Sep 17 00:00:00 2001 From: Peter 'Pita' Martischka Date: Sun, 4 Mar 2012 21:23:05 +0100 Subject: [PATCH 057/297] Fix configuration of express --- src/node/server.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/node/server.js b/src/node/server.js index 489cae74..19df6e72 100644 --- a/src/node/server.js +++ b/src/node/server.js @@ -78,7 +78,6 @@ async.waterfall([ { //create server var app = express.createServer(); - hooks.callAll("expressCreateServer", {"app": app}); app.use(function (req, res, next) { res.header("Server", serverName); @@ -87,6 +86,8 @@ async.waterfall([ app.configure(function() { hooks.callAll("expressConfigure", {"app": app}); }); + hooks.callAll("expressCreateServer", {"app": app}); + //let the server listen app.listen(settings.port, settings.ip); console.log("Server is listening at " + settings.ip + ":" + settings.port); From 7b518eeb2d1e0dbe320fb336ff4156d8aad1514a Mon Sep 17 00:00:00 2001 From: Peter 'Pita' Martischka Date: Sun, 4 Mar 2012 23:45:33 +0100 Subject: [PATCH 058/297] Fixing client side require, the minify code is completly unused now, very ugly solution --- node/server.js.rej | 500 ------------------ src/node/hooks/express/static.js | 81 +-- src/node/utils/Minify.js | 454 +++++++--------- .../node}/utils/caching_middleware.js | 0 4 files changed, 249 insertions(+), 786 deletions(-) delete mode 100644 node/server.js.rej rename {node => src/node}/utils/caching_middleware.js (100%) diff --git a/node/server.js.rej b/node/server.js.rej deleted file mode 100644 index c5377d81..00000000 --- a/node/server.js.rej +++ /dev/null @@ -1,500 +0,0 @@ -/** - * This module is started with bin/run.sh. It sets up a Express HTTP and a Socket.IO Server. - * Static file Requests are answered directly from this module, Socket.IO messages are passed - * to MessageHandler and minfied requests are passed to minified. - */ - -/* - * 2011 Peter 'Pita' Martischka (Primary Technology Ltd) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS-IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -var ERR = require("async-stacktrace"); -var log4js = require('log4js'); -var os = require("os"); -var socketio = require('socket.io'); -var fs = require('fs'); -var settings = require('./utils/Settings'); -var db = require('./db/DB'); -var async = require('async'); -var express = require('express'); -var path = require('path'); -var minify = require('./utils/Minify'); -var CachingMiddleware = require('./utils/caching_middleware'); -var Yajsml = require('yajsml'); -var formidable = require('formidable'); -var apiHandler; -var exportHandler; -var importHandler; -var exporthtml; -var readOnlyManager; -var padManager; -var securityManager; -var socketIORouter; - -//try to get the git version -var version = ""; -try -{ - var rootPath = path.normalize(__dirname + "/../") - var ref = fs.readFileSync(rootPath + ".git/HEAD", "utf-8"); - var refPath = rootPath + ".git/" + ref.substring(5, ref.indexOf("\n")); - version = fs.readFileSync(refPath, "utf-8"); - version = version.substring(0, 7); - console.log("Your Etherpad Lite git version is " + version); -} -catch(e) -{ - console.warn("Can't get git version for server header\n" + e.message) -} - -console.log("Report bugs at https://github.com/Pita/etherpad-lite/issues") - -var serverName = "Etherpad-Lite " + version + " (http://j.mp/ep-lite)"; - -exports.maxAge = settings.maxAge; - -//set loglevel -log4js.setGlobalLogLevel(settings.loglevel); - -async.waterfall([ - //initalize the database - function (callback) - { - db.init(callback); - }, - //initalize the http server - function (callback) - { - //create server - var app = express.createServer(); - - app.use(function (req, res, next) { - res.header("Server", serverName); - next(); - }); - - - //redirects browser to the pad's sanitized url if needed. otherwise, renders the html - app.param('pad', function (req, res, next, padId) { - //ensure the padname is valid and the url doesn't end with a / - if(!padManager.isValidPadId(padId) || /\/$/.test(req.url)) - { - res.send('Such a padname is forbidden', 404); - } - else - { - padManager.sanitizePadId(padId, function(sanitizedPadId) { - //the pad id was sanitized, so we redirect to the sanitized version - if(sanitizedPadId != padId) - { - var real_path = req.path.replace(/^\/p\/[^\/]+/, './' + sanitizedPadId); - res.header('Location', real_path); - res.send('You should be redirected to ' + real_path + '', 302); - } - //the pad id was fine, so just render it - else - { - next(); - } - }); - } - }); - - //load modules that needs a initalized db - readOnlyManager = require("./db/ReadOnlyManager"); - exporthtml = require("./utils/ExportHtml"); - exportHandler = require('./handler/ExportHandler'); - importHandler = require('./handler/ImportHandler'); - apiHandler = require('./handler/APIHandler'); - padManager = require('./db/PadManager'); - securityManager = require('./db/SecurityManager'); - socketIORouter = require("./handler/SocketIORouter"); - - //install logging - var httpLogger = log4js.getLogger("http"); - app.configure(function() - { - // Activate http basic auth if it has been defined in settings.json - if(settings.httpAuth != null) app.use(basic_auth); - - // If the log level specified in the config file is WARN or ERROR the application server never starts listening to requests as reported in issue #158. - // Not installing the log4js connect logger when the log level has a higher severity than INFO since it would not log at that level anyway. - if (!(settings.loglevel === "WARN" || settings.loglevel == "ERROR")) - app.use(log4js.connectLogger(httpLogger, { level: log4js.levels.INFO, format: ':status, :method :url'})); - app.use(express.cookieParser()); - }); - - app.error(function(err, req, res, next){ - res.send(500); - console.error(err.stack ? err.stack : err.toString()); - gracefulShutdown(); - }); - - // Cache both minified and static. - var assetCache = new CachingMiddleware; - app.all('/(minified|static)/*', assetCache.handle); - - // Minify will serve static files compressed (minify enabled). It also has - // file-specific hacks for ace/require-kernel/etc. - app.all('/static/:filename(*)', minify.minify); - - // Setup middleware that will package JavaScript files served by minify for - // CommonJS loader on the client-side. - var jsServer = new (Yajsml.Server)({ - rootPath: 'minified/' - , rootURI: 'http://localhost:' + settings.port + '/static/js/' - }); - var StaticAssociator = Yajsml.associators.StaticAssociator; - var associations = - Yajsml.associators.associationsForSimpleMapping(minify.tar); - var associator = new StaticAssociator(associations); - jsServer.setAssociator(associator); - app.use(jsServer); - - //checks for padAccess - function hasPadAccess(req, res, callback) - { - securityManager.checkAccess(req.params.pad, req.cookies.sessionid, req.cookies.token, req.cookies.password, function(err, accessObj) - { - if(ERR(err, callback)) return; - - //there is access, continue - if(accessObj.accessStatus == "grant") - { - callback(); - } - //no access - else - { - res.send("403 - Can't touch this", 403); - } - }); - } - - //checks for basic http auth - function basic_auth (req, res, next) { - if (req.headers.authorization && req.headers.authorization.search('Basic ') === 0) { - // fetch login and password - if (new Buffer(req.headers.authorization.split(' ')[1], 'base64').toString() == settings.httpAuth) { - next(); - return; - } - } - - res.header('WWW-Authenticate', 'Basic realm="Protected Area"'); - if (req.headers.authorization) { - setTimeout(function () { - res.send('Authentication required', 401); - }, 1000); - } else { - res.send('Authentication required', 401); - } - } - - //serve read only pad - app.get('/ro/:id', function(req, res) - { - var html; - var padId; - var pad; - - async.series([ - //translate the read only pad to a padId - function(callback) - { - readOnlyManager.getPadId(req.params.id, function(err, _padId) - { - if(ERR(err, callback)) return; - - padId = _padId; - - //we need that to tell hasPadAcess about the pad - req.params.pad = padId; - - callback(); - }); - }, - //render the html document - function(callback) - { - //return if the there is no padId - if(padId == null) - { - callback("notfound"); - return; - } - - hasPadAccess(req, res, function() - { - //render the html document - exporthtml.getPadHTMLDocument(padId, null, false, function(err, _html) - { - if(ERR(err, callback)) return; - html = _html; - callback(); - }); - }); - } - ], function(err) - { - //throw any unexpected error - if(err && err != "notfound") - ERR(err); - - if(err == "notfound") - res.send('404 - Not Found', 404); - else - res.send(html); - }); - }); - - //serve pad.html under /p - app.get('/p/:pad', function(req, res, next) - { - var filePath = path.normalize(__dirname + "/../static/pad.html"); - res.sendfile(filePath, { maxAge: exports.maxAge }); - }); - - //serve timeslider.html under /p/$padname/timeslider - app.get('/p/:pad/timeslider', function(req, res, next) - { - var filePath = path.normalize(__dirname + "/../static/timeslider.html"); - res.sendfile(filePath, { maxAge: exports.maxAge }); - }); - - //serve timeslider.html under /p/$padname/timeslider - app.get('/p/:pad/:rev?/export/:type', function(req, res, next) - { - var types = ["pdf", "doc", "txt", "html", "odt", "dokuwiki"]; - //send a 404 if we don't support this filetype - if(types.indexOf(req.params.type) == -1) - { - next(); - return; - } - - //if abiword is disabled, and this is a format we only support with abiword, output a message - if(settings.abiword == null && - ["odt", "pdf", "doc"].indexOf(req.params.type) !== -1) - { - res.send("Abiword is not enabled at this Etherpad Lite instance. Set the path to Abiword in settings.json to enable this feature"); - return; - } - - res.header("Access-Control-Allow-Origin", "*"); - - hasPadAccess(req, res, function() - { - exportHandler.doExport(req, res, req.params.pad, req.params.type); - }); - }); - - //handle import requests - app.post('/p/:pad/import', function(req, res, next) - { - //if abiword is disabled, skip handling this request - if(settings.abiword == null) - { - next(); - return; - } - - hasPadAccess(req, res, function() - { - importHandler.doImport(req, res, req.params.pad); - }); - }); - - var apiLogger = log4js.getLogger("API"); - - //This is for making an api call, collecting all post information and passing it to the apiHandler - var apiCaller = function(req, res, fields) - { - res.header("Content-Type", "application/json; charset=utf-8"); - - apiLogger.info("REQUEST, " + req.params.func + ", " + JSON.stringify(fields)); - - //wrap the send function so we can log the response - res._send = res.send; - res.send = function(response) - { - response = JSON.stringify(response); - apiLogger.info("RESPONSE, " + req.params.func + ", " + response); - - //is this a jsonp call, if yes, add the function call - if(req.query.jsonp) - response = req.query.jsonp + "(" + response + ")"; - - res._send(response); - } - - //call the api handler - apiHandler.handle(req.params.func, fields, req, res); - } - - //This is a api GET call, collect all post informations and pass it to the apiHandler - app.get('/api/1/:func', function(req, res) - { - apiCaller(req, res, req.query) - }); - - //This is a api POST call, collect all post informations and pass it to the apiHandler - app.post('/api/1/:func', function(req, res) - { - new formidable.IncomingForm().parse(req, function(err, fields, files) - { - apiCaller(req, res, fields) - }); - }); - - //The Etherpad client side sends information about how a disconnect happen - app.post('/ep/pad/connection-diagnostic-info', function(req, res) - { - new formidable.IncomingForm().parse(req, function(err, fields, files) - { - console.log("DIAGNOSTIC-INFO: " + fields.diagnosticInfo); - res.end("OK"); - }); - }); - - //The Etherpad client side sends information about client side javscript errors - app.post('/jserror', function(req, res) - { - new formidable.IncomingForm().parse(req, function(err, fields, files) - { - console.error("CLIENT SIDE JAVASCRIPT ERROR: " + fields.errorInfo); - res.end("OK"); - }); - }); - - //serve index.html under / - app.get('/', function(req, res) - { - var filePath = path.normalize(__dirname + "/../static/index.html"); - res.sendfile(filePath, { maxAge: exports.maxAge }); - }); - - //serve robots.txt - app.get('/robots.txt', function(req, res) - { - var filePath = path.normalize(__dirname + "/../static/robots.txt"); - res.sendfile(filePath, { maxAge: exports.maxAge }); - }); - - //serve favicon.ico - app.get('/favicon.ico', function(req, res) - { - var filePath = path.normalize(__dirname + "/../static/custom/favicon.ico"); - res.sendfile(filePath, { maxAge: exports.maxAge }, function(err) - { - //there is no custom favicon, send the default favicon - if(err) - { - filePath = path.normalize(__dirname + "/../static/favicon.ico"); - res.sendfile(filePath, { maxAge: exports.maxAge }); - } - }); - }); - - //let the server listen - app.listen(settings.port, settings.ip); - console.log("Server is listening at " + settings.ip + ":" + settings.port); - - var onShutdown = false; - var gracefulShutdown = function(err) - { - if(err && err.stack) - { - console.error(err.stack); - } - else if(err) - { - console.error(err); - } - - //ensure there is only one graceful shutdown running - if(onShutdown) return; - onShutdown = true; - - console.log("graceful shutdown..."); - - //stop the http server - app.close(); - - //do the db shutdown - db.db.doShutdown(function() - { - console.log("db sucessfully closed."); - - process.exit(0); - }); - - setTimeout(function(){ - process.exit(1); - }, 3000); - } - - //connect graceful shutdown with sigint and uncaughtexception - if(os.type().indexOf("Windows") == -1) - { - //sigint is so far not working on windows - //https://github.com/joyent/node/issues/1553 - process.on('SIGINT', gracefulShutdown); - } - - process.on('uncaughtException', gracefulShutdown); - - //init socket.io and redirect all requests to the MessageHandler - var io = socketio.listen(app); - - //this is only a workaround to ensure it works with all browers behind a proxy - //we should remove this when the new socket.io version is more stable - io.set('transports', ['xhr-polling']); - - var socketIOLogger = log4js.getLogger("socket.io"); - io.set('logger', { - debug: function (str) - { - socketIOLogger.debug.apply(socketIOLogger, arguments); - }, - info: function (str) - { - socketIOLogger.info.apply(socketIOLogger, arguments); - }, - warn: function (str) - { - socketIOLogger.warn.apply(socketIOLogger, arguments); - }, - error: function (str) - { - socketIOLogger.error.apply(socketIOLogger, arguments); - }, - }); - - //minify socket.io javascript - if(settings.minify) - io.enable('browser client minification'); - - var padMessageHandler = require("./handler/PadMessageHandler"); - var timesliderMessageHandler = require("./handler/TimesliderMessageHandler"); - - //Initalize the Socket.IO Router - socketIORouter.setSocketIO(io); - socketIORouter.addComponent("pad", padMessageHandler); - socketIORouter.addComponent("timeslider", timesliderMessageHandler); - - callback(null); - } -]); diff --git a/src/node/hooks/express/static.js b/src/node/hooks/express/static.js index 461d76af..9481eb5a 100644 --- a/src/node/hooks/express/static.js +++ b/src/node/hooks/express/static.js @@ -1,15 +1,60 @@ var path = require('path'); var minify = require('../../utils/Minify'); var plugins = require("ep_etherpad-lite/static/js/pluginfw/plugins"); +var CachingMiddleware = require('../../utils/caching_middleware'); +var settings = require("../../utils/Settings"); +var Yajsml = require('yajsml'); +var fs = require("fs"); +var ERR = require("async-stacktrace"); exports.expressCreateServer = function (hook_name, args, cb) { - //serve static files - args.app.get('/static/js/require-kernel.js', function (req, res, next) { - res.header("Content-Type","application/javascript; charset: utf-8"); - res.write(minify.requireDefinition()); // + "\n require.setLibraryURI('/plugins'); "); - res.end(); + /* Handle static files for plugins: + paths like "/static/plugins/ep_myplugin/js/test.js" + are rewritten into ROOT_PATH_OF_MYPLUGIN/static/js/test.js, + commonly ETHERPAD_ROOT/node_modules/ep_myplugin/static/js/test.js + */ + args.app.get(/^\/minified\/plugins\/([^\/]+)\/static\/(.*)/, function(req, res, next) { + var plugin_name = req.params[0]; + var modulePath = req.url.split("?")[0].substr("/minified/plugins/".length); + var fullPath = require.resolve(modulePath); + + if (plugins.plugins[plugin_name] == undefined) { + return next(); + } + + fs.readFile(fullPath, "utf8", function(err, data){ + if(ERR(err)) return; + + res.send("require.define('" + modulePath + "', function (require, exports, module) {" + data + "})"); + }) + +//require.define("/plugins.js", function (require, exports, module) { + + //res.sendfile(fullPath); }); + // Cache both minified and static. + var assetCache = new CachingMiddleware; + args.app.all('/(minified|static)/*', assetCache.handle); + + // Minify will serve static files compressed (minify enabled). It also has + // file-specific hacks for ace/require-kernel/etc. + args.app.all('/static/:filename(*)', minify.minify); + + // Setup middleware that will package JavaScript files served by minify for + // CommonJS loader on the client-side. + var jsServer = new (Yajsml.Server)({ + rootPath: 'minified/' + , rootURI: 'http://localhost:' + settings.port + '/static/js/' + }); + + var StaticAssociator = Yajsml.associators.StaticAssociator; + var associations = + Yajsml.associators.associationsForSimpleMapping(minify.tar); + var associator = new StaticAssociator(associations); + jsServer.setAssociator(associator); + args.app.use(jsServer); + // serve plugin definitions // not very static, but served here so that client can do require("pluginfw/static/js/plugin-definitions.js"); args.app.get('/pluginfw/plugin-definitions.json', function (req, res, next) { @@ -17,30 +62,4 @@ exports.expressCreateServer = function (hook_name, args, cb) { res.write(JSON.stringify({"plugins": plugins.plugins, "parts": plugins.parts})); res.end(); }); - - - /* Handle static files for plugins: - paths like "/static/plugins/ep_myplugin/js/test.js" - are rewritten into ROOT_PATH_OF_MYPLUGIN/static/js/test.js, - commonly ETHERPAD_ROOT/node_modules/ep_myplugin/static/js/test.js - */ - args.app.get(/^\/plugins\/([^\/]+)\/static\/(.*)/, function(req, res, next) { - var plugin_name = req.params[0]; - var url = req.params[1].replace(/\.\./g, '').split("?")[0]; - - if (plugins.plugins[plugin_name] == undefined) { - return next(); - } - - var filePath = path.normalize(path.join(plugins.plugins[plugin_name].package.path, "static", url)); - - res.sendfile(filePath, { maxAge: exports.maxAge }); - }); - - // Handle normal static files - args.app.get('/static/*', function(req, res) { - var filePath = path.normalize(__dirname + "/../../.." + - req.url.replace(/\.\./g, '').split("?")[0]); - res.sendfile(filePath, { maxAge: exports.maxAge }); - }); } diff --git a/src/node/utils/Minify.js b/src/node/utils/Minify.js index 87ba7fbc..a49195a7 100644 --- a/src/node/utils/Minify.js +++ b/src/node/utils/Minify.js @@ -27,316 +27,260 @@ var cleanCSS = require('clean-css'); var jsp = require("uglify-js").parser; var pro = require("uglify-js").uglify; var path = require('path'); -var Buffer = require('buffer').Buffer; -var zlib = require('zlib'); var RequireKernel = require('require-kernel'); var server = require('../server'); -var os = require('os'); -var ROOT_DIR = path.normalize(__dirname + "/../" ); -var JS_DIR = ROOT_DIR + '../static/js/'; -var CSS_DIR = ROOT_DIR + '../static/css/'; -var CACHE_DIR = path.join(settings.root, 'var'); +var ROOT_DIR = path.normalize(__dirname + "/../../static/"); var TAR_PATH = path.join(__dirname, 'tar.json'); var tar = JSON.parse(fs.readFileSync(TAR_PATH, 'utf8')); +// Rewrite tar to include modules with no extensions and proper rooted paths. +exports.tar = {}; +for (var key in tar) { + exports.tar['/' + key] = + tar[key].map(function (p) {return '/' + p}).concat( + tar[key].map(function (p) {return '/' + p.replace(/\.js$/, '')}) + ); +} + /** * creates the minifed javascript for the given minified name * @param req the Express request * @param res the Express response */ -exports.minifyJS = function(req, res, next) +exports.minify = function(req, res, next) { - var jsFilename = req.params[0]; - - //choose the js files we need - var jsFiles = undefined; - if (Object.prototype.hasOwnProperty.call(tar, jsFilename)) { - jsFiles = tar[jsFilename]; + var filename = req.params['filename']; + + // No relative paths, especially if they may go up the file hierarchy. + filename = path.normalize(path.join(ROOT_DIR, filename)); + if (filename.indexOf(ROOT_DIR) == 0) { + filename = filename.slice(ROOT_DIR.length); + filename = filename.replace(/\\/g, '/'); // Windows (safe generally?) } else { - /* Not in tar list, but try anyways, if it fails, pass to `next`. - Actually try, not check in filesystem here because - we don't want to duplicate the require.resolve() handling - */ - jsFiles = [jsFilename]; + res.writeHead(404, {}); + res.end(); + return; } - _handle(req, res, jsFilename, jsFiles, function (err) { - console.log("Unable to load minified file " + jsFilename + ": " + err.toString()); - /* Throw away error and generate a 404, not 500 */ - next(); - }); -} -function _handle(req, res, jsFilename, jsFiles, next) { - res.header("Content-Type","text/javascript"); - - var cacheName = CACHE_DIR + "/minified_" + jsFilename.replace(/\//g, "_"); - - //minifying is enabled - if(settings.minify) - { - var result = undefined; - var latestModification = 0; - - async.series([ - //find out the highest modification date - function(callback) - { - var folders2check = [CSS_DIR, JS_DIR]; - - //go trough this two folders - async.forEach(folders2check, function(path, callback) - { - //read the files in the folder - fs.readdir(path, function(err, files) - { - if(ERR(err, callback)) return; - - //we wanna check the directory itself for changes too - files.push("."); - - //go trough all files in this folder - async.forEach(files, function(filename, callback) - { - //get the stat data of this file - fs.stat(path + "/" + filename, function(err, stats) - { - if(ERR(err, callback)) return; - - //get the modification time - var modificationTime = stats.mtime.getTime(); - - //compare the modification time to the highest found - if(modificationTime > latestModification) - { - latestModification = modificationTime; - } - - callback(); - }); - }, callback); - }); - }, callback); - }, - function(callback) - { - //check the modification time of the minified js - fs.stat(cacheName, function(err, stats) - { - if(err && err.code != "ENOENT") - { - ERR(err, callback); - return; - } - - //there is no minfied file or there new changes since this file was generated, so continue generating this file - if((err && err.code == "ENOENT") || stats.mtime.getTime() < latestModification) - { - callback(); - } - //the minified file is still up to date, stop minifying - else - { - callback("stop"); - } - }); - }, - //load all js files - function (callback) - { - var values = []; - tarCode( - jsFiles - , function (content) {values.push(content)} - , function (err) { - if(ERR(err, next)) return; - - result = values.join(''); - callback(); - }); - }, - //put all together and write it into a file - function(callback) - { - async.parallel([ - //write the results plain in a file - function(callback) - { - fs.writeFile(cacheName, result, "utf8", callback); - }, - //write the results compressed in a file - function(callback) - { - zlib.gzip(result, function(err, compressedResult){ - //weird gzip bug that returns 0 instead of null if everything is ok - err = err === 0 ? null : err; - - if(ERR(err, callback)) return; - - fs.writeFile(cacheName + ".gz", compressedResult, callback); - }); - } - ],callback); - } - ], function(err) - { - if(err && err != "stop") - { - if(ERR(err)) return; - } - - //check if gzip is supported by this browser - var gzipSupport = req.header('Accept-Encoding', '').indexOf('gzip') != -1; - - var pathStr; - if(gzipSupport && os.type().indexOf("Windows") == -1) - { - pathStr = path.normalize(cacheName + ".gz"); - res.header('Content-Encoding', 'gzip'); - } - else - { - pathStr = path.normalize(cacheName); - } - - res.sendfile(pathStr, { maxAge: server.maxAge }); - }) + // What content type should this be? + // TODO: This should use a MIME module. + var contentType; + if (filename.match(/\.js$/)) { + contentType = "text/javascript"; + } else if (filename.match(/\.css$/)) { + contentType = "text/css"; + } else if (filename.match(/\.html$/)) { + contentType = "text/html"; + } else if (filename.match(/\.txt$/)) { + contentType = "text/plain"; + } else if (filename.match(/\.png$/)) { + contentType = "image/png"; + } else if (filename.match(/\.gif$/)) { + contentType = "image/gif"; + } else if (filename.match(/\.ico$/)) { + contentType = "image/x-icon"; + } else { + contentType = "application/octet-stream"; } - //minifying is disabled, so put the files together in one file - else - { - tarCode( - jsFiles - , function (content) {res.write(content)} - , function (err) { - if(ERR(err, next)) return; + + statFile(filename, function (error, date, exists) { + if (date) { + date = new Date(date); + res.setHeader('last-modified', date.toUTCString()); + res.setHeader('date', (new Date()).toUTCString()); + if (server.maxAge) { + var expiresDate = new Date((new Date()).getTime()+server.maxAge*1000); + res.setHeader('expires', expiresDate.toUTCString()); + res.setHeader('cache-control', 'max-age=' + server.maxAge); + } + } + + if (error) { + res.writeHead(500, {}); res.end(); - }); - } + } else if (!exists) { + res.writeHead(404, {}); + res.end(); + } else if (new Date(req.headers['if-modified-since']) >= date) { + res.writeHead(304, {}); + res.end(); + } else { + if (req.method == 'HEAD') { + res.header("Content-Type", contentType); + res.writeHead(200, {}); + res.end(); + } else if (req.method == 'GET') { + getFileCompressed(filename, contentType, function (error, content) { + if(ERR(error)) return; + res.header("Content-Type", contentType); + res.writeHead(200, {}); + res.write(content); + res.end(); + }); + } else { + res.writeHead(405, {'allow': 'HEAD, GET'}); + res.end(); + } + } + }); } // find all includes in ace.js and embed them. function getAceFile(callback) { - fs.readFile(JS_DIR + 'ace.js', "utf8", function(err, data) { + fs.readFile(ROOT_DIR + 'js/ace.js', "utf8", function(err, data) { if(ERR(err, callback)) return; // Find all includes in ace.js and embed them - var founds = data.match(/\$\$INCLUDE_[a-zA-Z_]+\([a-zA-Z0-9.\/_"-]+\)/gi); + var founds = data.match(/\$\$INCLUDE_[a-zA-Z_]+\("[^"]*"\)/gi); if (!settings.minify) { founds = []; } + // Always include the require kernel. founds.push('$$INCLUDE_JS("../static/js/require-kernel.js")'); data += ';\n'; data += 'Ace2Editor.EMBEDED = Ace2Editor.EMBEDED || {};\n'; - //go trough all includes + // Request the contents of the included file on the server-side and write + // them into the file. async.forEach(founds, function (item, callback) { var filename = item.match(/"([^"]*)"/)[1]; - var type = item.match(/INCLUDE_([A-Z]+)/)[1]; - var shortFilename = (filename.match(/^..\/static\/js\/(.*)$/, '')||[])[1]; + var request = require('request'); - //read the included files - if (shortFilename) { - if (shortFilename == 'require-kernel.js') { - // the kernel isn’t actually on the file system. - handleEmbed(null, requireDefinition()); + var baseURI = 'http://localhost:' + settings.port + + request(baseURI + path.normalize(path.join('/static/', filename)), function (error, response, body) { + if (!error && response.statusCode == 200) { + data += 'Ace2Editor.EMBEDED[' + JSON.stringify(filename) + '] = ' + + JSON.stringify(body || '') + ';\n'; } else { - var contents = ''; - tarCode(tar[shortFilename] || shortFilename - , function (content) { - contents += content; - } - , function () { - handleEmbed(null, contents); - } - ); + // Silence? } - } else { - fs.readFile(ROOT_DIR + filename, "utf8", handleEmbed); - } - - function handleEmbed(error, data_) { - if (error) { - return; // Don't bother to include it. - } - if (settings.minify) { - if (type == "JS") { - try { - data_ = compressJS([data_]); - } catch (e) { - // Ignore, include uncompresseed, which will break in browser. - } - } else { - data_ = compressCSS([data_]); - } - } - data += 'Ace2Editor.EMBEDED[' + JSON.stringify(filename) + '] = ' - + JSON.stringify(data_) + ';\n'; callback(); - } + }); }, function(error) { callback(error, data); }); }); } -exports.requireDefinition = requireDefinition; +// Check for the existance of the file and get the last modification date. +function statFile(filename, callback) { + if (filename == 'js/ace.js') { + // Sometimes static assets are inlined into this file, so we have to stat + // everything. + lastModifiedDateOfEverything(function (error, date) { + callback(error, date, !error); + }); + } else if (filename == 'js/require-kernel.js') { + callback(null, requireLastModified(), true); + } else { + fs.stat(ROOT_DIR + filename, function (error, stats) { + if (error) { + if (error.code == "ENOENT") { + // Stat the directory instead. + fs.stat(path.dirname(ROOT_DIR + filename), function (error, stats) { + if (error) { + if (error.code == "ENOENT") { + callback(null, null, false); + } else { + callback(error); + } + } else { + callback(null, stats.mtime.getTime(), false); + } + }); + } else { + callback(error); + } + } else { + callback(null, stats.mtime.getTime(), true); + } + }); + } +} +function lastModifiedDateOfEverything(callback) { + var folders2check = [ROOT_DIR + 'js/', ROOT_DIR + 'css/']; + var latestModification = 0; + //go trough this two folders + async.forEach(folders2check, function(path, callback) + { + //read the files in the folder + fs.readdir(path, function(err, files) + { + if(ERR(err, callback)) return; + + //we wanna check the directory itself for changes too + files.push("."); + + //go trough all files in this folder + async.forEach(files, function(filename, callback) + { + //get the stat data of this file + fs.stat(path + "/" + filename, function(err, stats) + { + if(ERR(err, callback)) return; + + //get the modification time + var modificationTime = stats.mtime.getTime(); + + //compare the modification time to the highest found + if(modificationTime > latestModification) + { + latestModification = modificationTime; + } + + callback(); + }); + }, callback); + }); + }, function () { + callback(null, latestModification); + }); +} + +// This should be provided by the module, but until then, just use startup +// time. +var _requireLastModified = new Date(); +function requireLastModified() { + return _requireLastModified.toUTCString(); +} function requireDefinition() { return 'var require = ' + RequireKernel.kernelSource + ';\n'; } -function tarCode(jsFiles, write, callback) { - write('require.define({'); - var initialEntry = true; - async.forEach(jsFiles, function (filename, callback){ - var path; - var srcPath; - if (filename.indexOf('plugins/') == 0) { - srcPath = filename.substring('plugins/'.length); - path = require.resolve(srcPath); +function getFileCompressed(filename, contentType, callback) { + getFile(filename, function (error, content) { + if (error || !content) { + callback(error, content); } else { - srcPath = '/' + filename; - path = JS_DIR + filename; - } - - srcPath = JSON.stringify(srcPath); - var srcPathAbbv = JSON.stringify(srcPath.replace(/\.js$/, '')); - - if (filename == 'ace.js') { - getAceFile(handleFile); - } else { - fs.readFile(path, "utf8", handleFile); - } - - function handleFile(err, data) { - if(ERR(err, callback)) return; - - if (!initialEntry) { - write('\n,'); - } else { - initialEntry = false; - } - write(srcPath + ': ') - data = '(function (require, exports, module) {' + data + '})'; if (settings.minify) { - write(compressJS([data])); - } else { - write(data); + if (contentType == 'text/javascript') { + try { + content = compressJS([content]); + } catch (error) { + // silence + } + } else if (contentType == 'text/css') { + content = compressCSS([content]); + } } - if (srcPath != srcPathAbbv) { - write('\n,' + srcPathAbbv + ': null'); - } - - callback(); + callback(null, content); } - }, function (err) { - if(ERR(err, callback)) return; - write('});\n'); - callback(); }); } +function getFile(filename, callback) { + if (filename == 'js/ace.js') { + getAceFile(callback); + } else if (filename == 'js/require-kernel.js') { + callback(undefined, requireDefinition()); + } else { + fs.readFile(ROOT_DIR + filename, callback); + } +} + function compressJS(values) { var complete = values.join("\n"); diff --git a/node/utils/caching_middleware.js b/src/node/utils/caching_middleware.js similarity index 100% rename from node/utils/caching_middleware.js rename to src/node/utils/caching_middleware.js From 92dc3e59d671b8e8249d3d1d15ae6336d34c0822 Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Wed, 7 Mar 2012 17:36:11 +0100 Subject: [PATCH 059/297] First attempt to implement the block system from django templates on top of the npm module ejs. --- src/node/eejs/eejs.js | 84 ++++++++++++++++++++++++++++++++++ src/node/eejs/examples/bar.ejs | 11 +++++ src/node/eejs/examples/foo.ejs | 7 +++ 3 files changed, 102 insertions(+) create mode 100644 src/node/eejs/eejs.js create mode 100644 src/node/eejs/examples/bar.ejs create mode 100644 src/node/eejs/examples/foo.ejs diff --git a/src/node/eejs/eejs.js b/src/node/eejs/eejs.js new file mode 100644 index 00000000..ed6b329b --- /dev/null +++ b/src/node/eejs/eejs.js @@ -0,0 +1,84 @@ +/* + * Copyright (c) 2011 RedHog (Egil Möller) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS-IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/* Basic usage: + * + * require("./eejs").require("./examples/foo.ejs") + */ + +var ejs = require("ejs"); +var fs = require("fs"); + +exports.init = function (b, recursive) { + if (!exports.info) { + exports.info = { + buf_stack: [], + block_stack: [], + blocks: {}, + level: 1 + } + } + exports.info.buf = b; +} + +exports.begin_capture = function() { + exports.info.buf_stack.push(exports.info.buf.concat()); + exports.info.buf.splice(0, exports.info.buf.length); +} + +exports.end_capture = function () { + var res = exports.info.buf.join(""); + exports.info.buf.splice.apply( + exports.info.buf, + [0, exports.info.buf.length].concat(exports.info.buf_stack.pop())); + return res; +} + +exports.begin_define_block = function (name) { + if (typeof exports.info.blocks[name] == "undefined") + exports.info.blocks[name] = {}; + exports.info.block_stack.push(name); + exports.begin_capture(); +} + +exports.end_define_block = function () { + content = exports.end_capture(); + var name = exports.info.block_stack.pop(); + if (typeof exports.info.blocks[name].content == "undefined") + exports.info.blocks[name].content = content; + return exports.info.blocks[name].content; +} + +exports.end_block = function () { + var res = exports.end_define_block(); + exports.info.buf.push(res); +} + +exports.begin_block = exports.begin_define_block; + +exports.require = function (name, args) { + if (args == undefined) args = {}; + if (exports.info) + exports.info.buf_stack.push(exports.info.buf); + var res = ejs.render( + fs.readFileSync(require.resolve(name)).toString(), + args); + if (exports.info) + exports.info.buf = exports.info.buf_stack.pop(); + if (exports.info.buf) + exports.info.buf.push(res); + return res; +} diff --git a/src/node/eejs/examples/bar.ejs b/src/node/eejs/examples/bar.ejs new file mode 100644 index 00000000..14ed975e --- /dev/null +++ b/src/node/eejs/examples/bar.ejs @@ -0,0 +1,11 @@ +<% var e = require("./eejs.js"); e.init(buf); %> + +a +<% e.begin_block("bar"); %> + A + <% e.begin_block("foo"); %> + XX + <% e.end_block(); %> + B +<% e.end_block(); %> +b diff --git a/src/node/eejs/examples/foo.ejs b/src/node/eejs/examples/foo.ejs new file mode 100644 index 00000000..5dcac61c --- /dev/null +++ b/src/node/eejs/examples/foo.ejs @@ -0,0 +1,7 @@ +<% var e = require("./eejs.js"); e.init(buf); %> + +<% e.begin_define_block("foo"); %> +YY +<% e.end_define_block(); %> + +<% e.require("./bar.ejs"); %> From f6212f452ca54efd1cb46dc5bd7c72d9a2213e4d Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Thu, 8 Mar 2012 21:01:01 +0100 Subject: [PATCH 060/297] Bugfix --- src/node/eejs/eejs.js | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/src/node/eejs/eejs.js b/src/node/eejs/eejs.js index ed6b329b..8faaab80 100644 --- a/src/node/eejs/eejs.js +++ b/src/node/eejs/eejs.js @@ -21,6 +21,7 @@ var ejs = require("ejs"); var fs = require("fs"); +var path = require("path"); exports.init = function (b, recursive) { if (!exports.info) { @@ -28,7 +29,7 @@ exports.init = function (b, recursive) { buf_stack: [], block_stack: [], blocks: {}, - level: 1 + filestack: [], } } exports.info.buf = b; @@ -71,13 +72,22 @@ exports.begin_block = exports.begin_define_block; exports.require = function (name, args) { if (args == undefined) args = {}; - if (exports.info) - exports.info.buf_stack.push(exports.info.buf); + if (!exports.info) + exports.init(null); + + if ((name.indexOf("./") == 0 || name.indexOf("../") == 0) && exports.info.file_stack) { + name = path.join(exports.info.file_stack[exports.info.file_stack.length-1], name); + } + var ejspath = require.resolve(name) + + exports.info.file_stack.push(ejpath); + exports.info.buf_stack.push(exports.info.buf); var res = ejs.render( - fs.readFileSync(require.resolve(name)).toString(), + fs.readFileSync(ejspath).toString(), args); - if (exports.info) - exports.info.buf = exports.info.buf_stack.pop(); + exports.info.buf = exports.info.buf_stack.pop(); + exports.info.file_stack.pop(); + if (exports.info.buf) exports.info.buf.push(res); return res; From 72571e5ef08fc4b42f11bcfccee7ea4aa648264e Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Thu, 8 Mar 2012 21:03:22 +0100 Subject: [PATCH 061/297] Bugfixing cache --- src/node/utils/caching_middleware.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/node/utils/caching_middleware.js b/src/node/utils/caching_middleware.js index f25059b8..df114350 100644 --- a/src/node/utils/caching_middleware.js +++ b/src/node/utils/caching_middleware.js @@ -21,9 +21,9 @@ var path = require('path'); var server = require('../server'); var zlib = require('zlib'); var util = require('util'); +var settings = require('./Settings'); -var ROOT_DIR = path.normalize(__dirname + "/../"); -var CACHE_DIR = ROOT_DIR + '../var/'; +var CACHE_DIR = path.join(settings.root, 'var'); var responseCache = {}; From 384d7686102ff5bbd6e795b07b70ec33eb6e1fa3 Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Thu, 8 Mar 2012 21:47:18 +0100 Subject: [PATCH 062/297] One more bug in cache dir setting --- src/node/utils/caching_middleware.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/node/utils/caching_middleware.js b/src/node/utils/caching_middleware.js index df114350..9712deb3 100644 --- a/src/node/utils/caching_middleware.js +++ b/src/node/utils/caching_middleware.js @@ -23,7 +23,7 @@ var zlib = require('zlib'); var util = require('util'); var settings = require('./Settings'); -var CACHE_DIR = path.join(settings.root, 'var'); +var CACHE_DIR = path.join(settings.root, 'var/'); var responseCache = {}; From 6af869caddac5046db48484de4b5ae836d05709d Mon Sep 17 00:00:00 2001 From: Chad Weider Date: Tue, 6 Mar 2012 17:27:03 -0800 Subject: [PATCH 063/297] Modules requires use relative paths. --- static/js/Changeset.js | 2 +- static/js/ace.js | 2 +- static/js/ace2_common.js | 2 +- static/js/ace2_inner.js | 25 +++++++++--------- static/js/broadcast.js | 12 ++++----- static/js/changesettracker.js | 4 +-- static/js/chat.js | 4 +-- static/js/collab_client.js | 2 +- static/js/contentcollector.js | 4 +-- static/js/domline.js | 6 ++--- static/js/linestylefilter.js | 6 ++--- static/js/pad.js | 42 +++++++++++++++---------------- static/js/pad_connectionstatus.js | 2 +- static/js/pad_docbar.js | 4 +-- static/js/pad_editbar.js | 6 ++--- static/js/pad_editor.js | 6 ++--- static/js/pad_impexp.js | 2 +- static/js/pad_modals.js | 4 +-- static/js/pad_savedrevs.js | 4 +-- static/js/pad_userlist.js | 2 +- static/js/pad_utils.js | 8 +++--- static/js/timeslider.js | 20 +++++++-------- static/js/undomodule.js | 4 +-- 23 files changed, 86 insertions(+), 87 deletions(-) diff --git a/static/js/Changeset.js b/static/js/Changeset.js index 81c0c81b..fd1900ba 100644 --- a/static/js/Changeset.js +++ b/static/js/Changeset.js @@ -25,7 +25,7 @@ * limitations under the License. */ -var AttributePoolFactory = require("/AttributePoolFactory"); +var AttributePoolFactory = require("./AttributePoolFactory"); var _opt = null; diff --git a/static/js/ace.js b/static/js/ace.js index 22d4eaa6..789aba52 100644 --- a/static/js/ace.js +++ b/static/js/ace.js @@ -28,7 +28,7 @@ Ace2Editor.registry = { nextId: 1 }; -var plugins = require('/plugins').plugins; +var plugins = require('./plugins').plugins; function Ace2Editor() { diff --git a/static/js/ace2_common.js b/static/js/ace2_common.js index 0f8195fa..9f217045 100644 --- a/static/js/ace2_common.js +++ b/static/js/ace2_common.js @@ -20,7 +20,7 @@ * limitations under the License. */ -var Security = require('/security'); +var Security = require('./security'); function isNodeText(node) { diff --git a/static/js/ace2_inner.js b/static/js/ace2_inner.js index 17d02036..66f19faf 100644 --- a/static/js/ace2_inner.js +++ b/static/js/ace2_inner.js @@ -20,7 +20,7 @@ * limitations under the License. */ -var Ace2Common = require('/ace2_common'); +var Ace2Common = require('./ace2_common'); // Extract useful method defined in the other module. var isNodeText = Ace2Common.isNodeText; @@ -38,18 +38,17 @@ var htmlPrettyEscape = Ace2Common.htmlPrettyEscape; var map = Ace2Common.map; var noop = Ace2Common.noop; -var makeChangesetTracker = require('/changesettracker').makeChangesetTracker; -var colorutils = require('/colorutils').colorutils; -var makeContentCollector = require('/contentcollector').makeContentCollector; -var makeCSSManager = require('/cssmanager').makeCSSManager; -var domline = require('/domline').domline; -var AttribPool = require('/AttributePoolFactory').createAttributePool; -var Changeset = require('/Changeset'); -var linestylefilter = require('/linestylefilter').linestylefilter; -var newSkipList = require('/skiplist').newSkipList; -var undoModule = require('/undomodule').undoModule; -var makeVirtualLineView = require('/virtual_lines').makeVirtualLineView; - +var makeChangesetTracker = require('./changesettracker').makeChangesetTracker; +var colorutils = require('./colorutils').colorutils; +var makeContentCollector = require('./contentcollector').makeContentCollector; +var makeCSSManager = require('./cssmanager').makeCSSManager; +var domline = require('./domline').domline; +var AttribPool = require('./AttributePoolFactory').createAttributePool; +var Changeset = require('./Changeset'); +var linestylefilter = require('./linestylefilter').linestylefilter; +var newSkipList = require('./skiplist').newSkipList; +var undoModule = require('./undomodule').undoModule; +var makeVirtualLineView = require('./virtual_lines').makeVirtualLineView; function Ace2Inner(){ var DEBUG = false; //$$ build script replaces the string "var DEBUG=true;//$$" with "var DEBUG=false;" diff --git a/static/js/broadcast.js b/static/js/broadcast.js index 97256bbf..485db44f 100644 --- a/static/js/broadcast.js +++ b/static/js/broadcast.js @@ -20,12 +20,12 @@ * limitations under the License. */ -var makeCSSManager = require('/cssmanager').makeCSSManager; -var domline = require('/domline').domline; -var AttribPool = require('/AttributePoolFactory').createAttributePool; -var Changeset = require('/Changeset'); -var linestylefilter = require('/linestylefilter').linestylefilter; -var colorutils = require('/colorutils').colorutils; +var makeCSSManager = require('./cssmanager').makeCSSManager; +var domline = require('./domline').domline; +var AttribPool = require('./AttributePoolFactory').createAttributePool; +var Changeset = require('./Changeset'); +var linestylefilter = require('./linestylefilter').linestylefilter; +var colorutils = require('./colorutils').colorutils; var Ace2Common = require('./ace2_common'); var map = Ace2Common.map; diff --git a/static/js/changesettracker.js b/static/js/changesettracker.js index e34dc107..b0219852 100644 --- a/static/js/changesettracker.js +++ b/static/js/changesettracker.js @@ -20,8 +20,8 @@ * limitations under the License. */ -var AttribPool = require('/AttributePoolFactory').createAttributePool; -var Changeset = require('/Changeset'); +var AttribPool = require('./AttributePoolFactory').createAttributePool; +var Changeset = require('./Changeset'); function makeChangesetTracker(scheduler, apool, aceCallbacksProvider) { diff --git a/static/js/chat.js b/static/js/chat.js index 8f076af6..b8f22e9e 100644 --- a/static/js/chat.js +++ b/static/js/chat.js @@ -20,8 +20,8 @@ * limitations under the License. */ -var padutils = require('/pad_utils').padutils; -var padcookie = require('/pad_cookie').padcookie; +var padutils = require('./pad_utils').padutils; +var padcookie = require('./pad_cookie').padcookie; var chat = (function() { diff --git a/static/js/collab_client.js b/static/js/collab_client.js index bb68f604..18e3616b 100644 --- a/static/js/collab_client.js +++ b/static/js/collab_client.js @@ -20,7 +20,7 @@ * limitations under the License. */ -var chat = require('/chat').chat; +var chat = require('./chat').chat; // Dependency fill on init. This exists for `pad.socket` only. // TODO: bind directly to the socket. diff --git a/static/js/contentcollector.js b/static/js/contentcollector.js index 96dc4b7d..616e6e2b 100644 --- a/static/js/contentcollector.js +++ b/static/js/contentcollector.js @@ -25,8 +25,8 @@ var _MAX_LIST_LEVEL = 8; -var Changeset = require('/Changeset'); -var plugins = require('/plugins').plugins; +var Changeset = require('./Changeset'); +var plugins = require('./plugins').plugins; function sanitizeUnicode(s) { diff --git a/static/js/domline.js b/static/js/domline.js index 3074c9e9..e2491633 100644 --- a/static/js/domline.js +++ b/static/js/domline.js @@ -26,9 +26,9 @@ // requires: plugins // requires: undefined -var Security = require('/security'); -var Ace2Common = require('/ace2_common'); -var plugins = require('/plugins').plugins; +var Security = require('./security'); +var Ace2Common = require('./ace2_common'); +var plugins = require('./plugins').plugins; var map = Ace2Common.map; var noop = Ace2Common.noop; var identity = Ace2Common.identity; diff --git a/static/js/linestylefilter.js b/static/js/linestylefilter.js index 4b455724..2b9baebc 100644 --- a/static/js/linestylefilter.js +++ b/static/js/linestylefilter.js @@ -28,9 +28,9 @@ // requires: plugins // requires: undefined -var Changeset = require('/Changeset'); -var plugins = require('/plugins').plugins; -var map = require('/ace2_common').map; +var Changeset = require('./Changeset'); +var plugins = require('./plugins').plugins; +var map = require('./ace2_common').map; var linestylefilter = {}; diff --git a/static/js/pad.js b/static/js/pad.js index bda68956..d19cface 100644 --- a/static/js/pad.js +++ b/static/js/pad.js @@ -26,29 +26,29 @@ var socket; // These jQuery things should create local references, but for now `require()` // assigns to the global `$` and augments it with plugins. -require('/jquery'); -require('/farbtastic'); -require('/excanvas'); -JSON = require('/json2'); -require('/undo-xpopup'); -require('/prefixfree'); +require('./jquery'); +require('./farbtastic'); +require('./excanvas'); +JSON = require('./json2'); +require('./undo-xpopup'); +require('./prefixfree'); -var chat = require('/chat').chat; -var getCollabClient = require('/collab_client').getCollabClient; -var padconnectionstatus = require('/pad_connectionstatus').padconnectionstatus; -var padcookie = require('/pad_cookie').padcookie; -var paddocbar = require('/pad_docbar').paddocbar; -var padeditbar = require('/pad_editbar').padeditbar; -var padeditor = require('/pad_editor').padeditor; -var padimpexp = require('/pad_impexp').padimpexp; -var padmodals = require('/pad_modals').padmodals; -var padsavedrevs = require('/pad_savedrevs').padsavedrevs; -var paduserlist = require('/pad_userlist').paduserlist; -var padutils = require('/pad_utils').padutils; +var chat = require('./chat').chat; +var getCollabClient = require('./collab_client').getCollabClient; +var padconnectionstatus = require('./pad_connectionstatus').padconnectionstatus; +var padcookie = require('./pad_cookie').padcookie; +var paddocbar = require('./pad_docbar').paddocbar; +var padeditbar = require('./pad_editbar').padeditbar; +var padeditor = require('./pad_editor').padeditor; +var padimpexp = require('./pad_impexp').padimpexp; +var padmodals = require('./pad_modals').padmodals; +var padsavedrevs = require('./pad_savedrevs').padsavedrevs; +var paduserlist = require('./pad_userlist').paduserlist; +var padutils = require('./pad_utils').padutils; -var createCookie = require('/pad_utils').createCookie; -var readCookie = require('/pad_utils').readCookie; -var randomString = require('/pad_utils').randomString; +var createCookie = require('./pad_utils').createCookie; +var readCookie = require('./pad_utils').readCookie; +var randomString = require('./pad_utils').randomString; function getParams() { diff --git a/static/js/pad_connectionstatus.js b/static/js/pad_connectionstatus.js index 1de024e8..bb0f0521 100644 --- a/static/js/pad_connectionstatus.js +++ b/static/js/pad_connectionstatus.js @@ -20,7 +20,7 @@ * limitations under the License. */ -var padmodals = require('/pad_modals').padmodals; +var padmodals = require('./pad_modals').padmodals; var padconnectionstatus = (function() { diff --git a/static/js/pad_docbar.js b/static/js/pad_docbar.js index b83bf3bf..08bbb0c4 100644 --- a/static/js/pad_docbar.js +++ b/static/js/pad_docbar.js @@ -20,7 +20,7 @@ * limitations under the License. */ -var padutils = require('/pad_utils').padutils; +var padutils = require('./pad_utils').padutils; var paddocbar = (function() { @@ -449,7 +449,7 @@ var paddocbar = (function() handleResizePage: function() { // Side-step circular reference. This should be injected. - var padsavedrevs = require('/pad_savedrevs').padsavedrevs; + var padsavedrevs = require('./pad_savedrevs').padsavedrevs; padsavedrevs.handleResizePage(); }, hideLaterIfNoOtherInteraction: function() diff --git a/static/js/pad_editbar.js b/static/js/pad_editbar.js index 23692631..04f03992 100644 --- a/static/js/pad_editbar.js +++ b/static/js/pad_editbar.js @@ -20,9 +20,9 @@ * limitations under the License. */ -var padutils = require('/pad_utils').padutils; -var padeditor = require('/pad_editor').padeditor; -var padsavedrevs = require('/pad_savedrevs').padsavedrevs; +var padutils = require('./pad_utils').padutils; +var padeditor = require('./pad_editor').padeditor; +var padsavedrevs = require('./pad_savedrevs').padsavedrevs; function indexOf(array, value) { for (var i = 0, ii = array.length; i < ii; i++) { diff --git a/static/js/pad_editor.js b/static/js/pad_editor.js index 3dd67544..12f83aeb 100644 --- a/static/js/pad_editor.js +++ b/static/js/pad_editor.js @@ -20,8 +20,8 @@ * limitations under the License. */ -var padcookie = require('/pad_cookie').padcookie; -var padutils = require('/pad_utils').padutils; +var padcookie = require('./pad_cookie').padcookie; +var padutils = require('./pad_utils').padutils; var padeditor = (function() { @@ -34,7 +34,7 @@ var padeditor = (function() viewZoom: 100, init: function(readyFunc, initialViewOptions, _pad) { - Ace2Editor = require('/ace').Ace2Editor; + Ace2Editor = require('./ace').Ace2Editor; pad = _pad; settings = pad.settings; diff --git a/static/js/pad_impexp.js b/static/js/pad_impexp.js index 9ff09d19..23655ba4 100644 --- a/static/js/pad_impexp.js +++ b/static/js/pad_impexp.js @@ -20,7 +20,7 @@ * limitations under the License. */ -var paddocbar = require('/pad_docbar').paddocbar; +var paddocbar = require('./pad_docbar').paddocbar; var padimpexp = (function() { diff --git a/static/js/pad_modals.js b/static/js/pad_modals.js index b78e28f4..0dd281bb 100644 --- a/static/js/pad_modals.js +++ b/static/js/pad_modals.js @@ -20,8 +20,8 @@ * limitations under the License. */ -var padutils = require('/pad_utils').padutils; -var paddocbar = require('/pad_docbar').paddocbar; +var padutils = require('./pad_utils').padutils; +var paddocbar = require('./pad_docbar').paddocbar; var padmodals = (function() { diff --git a/static/js/pad_savedrevs.js b/static/js/pad_savedrevs.js index 6d37dfa8..2a0f4fde 100644 --- a/static/js/pad_savedrevs.js +++ b/static/js/pad_savedrevs.js @@ -20,8 +20,8 @@ * limitations under the License. */ -var padutils = require('/pad_utils').padutils; -var paddocbar = require('/pad_docbar').paddocbar; +var padutils = require('./pad_utils').padutils; +var paddocbar = require('./pad_docbar').paddocbar; var padsavedrevs = (function() { diff --git a/static/js/pad_userlist.js b/static/js/pad_userlist.js index 2c063d74..5a3f9b35 100644 --- a/static/js/pad_userlist.js +++ b/static/js/pad_userlist.js @@ -20,7 +20,7 @@ * limitations under the License. */ -var padutils = require('/pad_utils').padutils; +var padutils = require('./pad_utils').padutils; var myUserInfo = {}; diff --git a/static/js/pad_utils.js b/static/js/pad_utils.js index fb538211..8f7347bf 100644 --- a/static/js/pad_utils.js +++ b/static/js/pad_utils.js @@ -20,7 +20,7 @@ * limitations under the License. */ -var Security = require('/security'); +var Security = require('./security'); /** * Generates a random String with the given length. Is needed to generate the Author, Group, readonly, session Ids @@ -75,7 +75,7 @@ var padutils = { }, uniqueId: function() { - var pad = require('/pad').pad; // Sidestep circular dependency + var pad = require('./pad').pad; // Sidestep circular dependency function encodeNum(n, width) { // returns string that is exactly 'width' chars, padding with zeros @@ -250,7 +250,7 @@ var padutils = { }, timediff: function(d) { - var pad = require('/pad').pad; // Sidestep circular dependency + var pad = require('./pad').pad; // Sidestep circular dependency function format(n, word) { n = Math.round(n); @@ -520,7 +520,7 @@ function setupGlobalExceptionHandler() { padutils.setupGlobalExceptionHandler = setupGlobalExceptionHandler; -padutils.binarySearch = require('/ace2_common').binarySearch; +padutils.binarySearch = require('./ace2_common').binarySearch; exports.randomString = randomString; exports.createCookie = createCookie; diff --git a/static/js/timeslider.js b/static/js/timeslider.js index 143ef328..579dcb60 100644 --- a/static/js/timeslider.js +++ b/static/js/timeslider.js @@ -22,13 +22,13 @@ // These jQuery things should create local references, but for now `require()` // assigns to the global `$` and augments it with plugins. -require('/jquery'); -JSON = require('/json2'); -require('/undo-xpopup'); +require('./jquery'); +JSON = require('./json2'); +require('./undo-xpopup'); -var createCookie = require('/pad_utils').createCookie; -var readCookie = require('/pad_utils').readCookie; -var randomString = require('/pad_utils').randomString; +var createCookie = require('./pad_utils').createCookie; +var readCookie = require('./pad_utils').readCookie; +var randomString = require('./pad_utils').randomString; var socket, token, padId, export_links; @@ -127,12 +127,12 @@ function handleClientVars(message) clientVars = message.data; //load all script that doesn't work without the clientVars - BroadcastSlider = require('/broadcast_slider').loadBroadcastSliderJS(fireWhenAllScriptsAreLoaded); - require('/broadcast_revisions').loadBroadcastRevisionsJS(); - changesetLoader = require('/broadcast').loadBroadcastJS(socket, sendSocketMsg, fireWhenAllScriptsAreLoaded, BroadcastSlider); + BroadcastSlider = require('./broadcast_slider').loadBroadcastSliderJS(fireWhenAllScriptsAreLoaded); + require('./broadcast_revisions').loadBroadcastRevisionsJS(); + changesetLoader = require('./broadcast').loadBroadcastJS(socket, sendSocketMsg, fireWhenAllScriptsAreLoaded, BroadcastSlider); //initialize export ui - require('/pad_impexp').padimpexp.init(); + require('./pad_impexp').padimpexp.init(); //change export urls when the slider moves var export_rev_regex = /(\/\d+)?\/export/ diff --git a/static/js/undomodule.js b/static/js/undomodule.js index 886cbdf0..8b0c0909 100644 --- a/static/js/undomodule.js +++ b/static/js/undomodule.js @@ -20,8 +20,8 @@ * limitations under the License. */ -var Changeset = require('/Changeset'); -var extend = require('/ace2_common').extend; +var Changeset = require('./Changeset'); +var extend = require('./ace2_common').extend; var undoModule = (function() { From 652fffe8eabc6e31bf4801d62296566351d8c32d Mon Sep 17 00:00:00 2001 From: Chad Weider Date: Tue, 6 Mar 2012 17:42:32 -0800 Subject: [PATCH 064/297] Upgrade require-kernel for relative path fixes. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 01eb8e96..0c10d5cb 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "dependencies" : { "yajsml" : "1.1.2", "request" : "2.9.100", - "require-kernel" : "1.0.3", + "require-kernel" : "1.0.5", "socket.io" : "0.8.7", "ueberDB" : "0.1.7", "async" : "0.1.18", From ee312672d307e3bcc981b952dc2a4ff88d5c2d08 Mon Sep 17 00:00:00 2001 From: Chad Weider Date: Sat, 10 Mar 2012 14:36:54 -0800 Subject: [PATCH 065/297] This is duplicated by the contents of static. --- src/ep.json | 1 - src/node/hooks/express/minified.js | 6 ------ 2 files changed, 7 deletions(-) delete mode 100644 src/node/hooks/express/minified.js diff --git a/src/ep.json b/src/ep.json index bc955dbf..59cbf3aa 100644 --- a/src/ep.json +++ b/src/ep.json @@ -3,7 +3,6 @@ { "name": "static", "hooks": { "expressCreateServer": "ep_etherpad-lite/node/hooks/express/static:expressCreateServer" } }, { "name": "specialpages", "hooks": { "expressCreateServer": "ep_etherpad-lite/node/hooks/express/specialpages:expressCreateServer" } }, { "name": "padurlsanitize", "hooks": { "expressCreateServer": "ep_etherpad-lite/node/hooks/express/padurlsanitize:expressCreateServer" } }, - { "name": "minified", "hooks": { "expressCreateServer": "ep_etherpad-lite/node/hooks/express/minified:expressCreateServer" } }, { "name": "padreadonly", "hooks": { "expressCreateServer": "ep_etherpad-lite/node/hooks/express/padreadonly:expressCreateServer" } }, { "name": "webaccess", "hooks": { "expressConfigure": "ep_etherpad-lite/node/hooks/express/webaccess:expressConfigure" } }, { "name": "apicalls", "hooks": { "expressCreateServer": "ep_etherpad-lite/node/hooks/express/apicalls:expressCreateServer" } }, diff --git a/src/node/hooks/express/minified.js b/src/node/hooks/express/minified.js deleted file mode 100644 index f8a988d7..00000000 --- a/src/node/hooks/express/minified.js +++ /dev/null @@ -1,6 +0,0 @@ -var minify = require('../../utils/Minify'); - -exports.expressCreateServer = function (hook_name, args, cb) { - //serve minified files - args.app.get(/^\/minified\/(.*)/, minify.minifyJS); -} From 648603126b7d9ab87cb9b19b5422d936dc2536f4 Mon Sep 17 00:00:00 2001 From: Chad Weider Date: Sat, 10 Mar 2012 13:59:07 -0800 Subject: [PATCH 066/297] Remove require changes in `pushScriptsTo` method. These duplicate `pushRequireScriptTo` at least, but mostly break things. --- src/static/js/ace.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/static/js/ace.js b/src/static/js/ace.js index 4114b63c..7331d68d 100644 --- a/src/static/js/ace.js +++ b/src/static/js/ace.js @@ -176,10 +176,6 @@ function Ace2Editor() } else { file = ACE_SOURCE; file = file.replace(/^\.\.\/static\/js\//, '../minified/'); - buffer.push('\ - + - + - + - + - + - + From 4e039d68da8e781c3959f41272a4cc05ff436b8e Mon Sep 17 00:00:00 2001 From: Chad Weider Date: Sat, 10 Mar 2012 15:52:22 -0800 Subject: [PATCH 077/297] Correct indentation. --- src/static/pad.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/static/pad.html b/src/static/pad.html index 98451e5f..95a5b98f 100644 --- a/src/static/pad.html +++ b/src/static/pad.html @@ -269,9 +269,9 @@ require.setGlobalKeyPath("require"); var plugins = require('ep_etherpad-lite/static/js/pluginfw/plugins'); - plugins.update(function () { - require('ep_etherpad-lite/static/js/pad').init(); - }); + plugins.update(function () { + require('ep_etherpad-lite/static/js/pad').init(); + }); /* TODO: These globals shouldn't exist. */ pad = require('ep_etherpad-lite/static/js/pad').pad; From 3a115154e77c9d9ab83ddf4ae539f36866a8e0b4 Mon Sep 17 00:00:00 2001 From: Chad Weider Date: Sat, 10 Mar 2012 17:15:04 -0800 Subject: [PATCH 078/297] Migrate tar to use library paths. --- src/node/utils/Minify.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/node/utils/Minify.js b/src/node/utils/Minify.js index 4e1c44db..a4c3efa0 100644 --- a/src/node/utils/Minify.js +++ b/src/node/utils/Minify.js @@ -36,11 +36,14 @@ var TAR_PATH = path.join(__dirname, 'tar.json'); var tar = JSON.parse(fs.readFileSync(TAR_PATH, 'utf8')); // Rewrite tar to include modules with no extensions and proper rooted paths. +var LIBRARY_PREFIX = 'ep_etherpad-lite/static/js'; exports.tar = {}; for (var key in tar) { - exports.tar['/' + key] = - tar[key].map(function (p) {return '/' + p}).concat( - tar[key].map(function (p) {return '/' + p.replace(/\.js$/, '')}) + exports.tar[LIBRARY_PREFIX + '/' + key] = + tar[key].map(function (p) {return LIBRARY_PREFIX + '/' + p}).concat( + tar[key].map(function (p) { + return LIBRARY_PREFIX + '/' + p.replace(/\.js$/, '') + }) ); } From 65ad9da155a6ceac1b9a9f4dd90b19fc5feebd88 Mon Sep 17 00:00:00 2001 From: Chad Weider Date: Sat, 10 Mar 2012 18:19:40 -0800 Subject: [PATCH 079/297] Correct resource paths. --- static/timeslider.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/static/timeslider.html b/static/timeslider.html index 19f5fefc..42e812b7 100644 --- a/static/timeslider.html +++ b/static/timeslider.html @@ -204,8 +204,8 @@ + + <% if (errors.length) { %> @@ -54,7 +137,8 @@

Search for plugins to install

- + +
@@ -64,23 +148,28 @@ - - <% for (var plugin_name in search_results) { %> - <% var plugin = search_results[plugin_name]; %> - - - - - - <% } %> + + + + + + + +
<%= plugin.name %><%= plugin.description %> -
- - -
-
+ +
+
+

+ Please wait: + +

+ +
+
+ From d0dd746c8bf33b55999cb673babef68987854c23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Bartelme=C3=9F?= Date: Fri, 16 Mar 2012 18:21:28 +0100 Subject: [PATCH 095/297] added .keys method to objects, if not supported, fixes IE issue with pluginfw --- src/static/js/ace2_common.js | 12 ++++++++++-- src/static/js/pluginfw/plugins.js | 2 ++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/static/js/ace2_common.js b/src/static/js/ace2_common.js index 7fe08a7e..41fb320d 100644 --- a/src/static/js/ace2_common.js +++ b/src/static/js/ace2_common.js @@ -47,7 +47,7 @@ function extend(obj, props) var forEachImpl = function(fn){ for (var i = 0; i < this.length; i++) { - var result = func(this[i], i, this); + var result = fn(this[i], i, this); } } @@ -64,11 +64,19 @@ function mapImpl(fn) return result; } +// From underscore.js +var keysImpl =function(obj) { + if (obj !== Object(obj)) throw new TypeError('Invalid object'); + var keys = []; + for (var key in obj) if (obj.hasOwnProperty(key)) keys.push(key); + + return keys; +}; Array.prototype.forEach = Array.prototype.forEach || forEachImpl; Array.prototype.each = Array.prototype.each || forEachImpl; Array.prototype.map = Array.prototype.map || mapImpl; - +Object.keys = Object.keys || keysImpl; function isArray(testObject) { diff --git a/src/static/js/pluginfw/plugins.js b/src/static/js/pluginfw/plugins.js index c5c21903..b126a6fe 100644 --- a/src/static/js/pluginfw/plugins.js +++ b/src/static/js/pluginfw/plugins.js @@ -10,6 +10,8 @@ if (!exports.isClient) { var fs = require("fs"); var tsort = require("./tsort"); var util = require("util"); +}else{ + require("../ace2_common.js"); } exports.prefix = 'ep_'; From e559df18ce7876c497bd6da64c3a1c0346f211f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Bartelme=C3=9F?= Date: Sat, 17 Mar 2012 13:36:42 +0100 Subject: [PATCH 096/297] use underscore.js --- src/package.json | 3 +- src/static/js/ace.js | 5 +- src/static/js/ace2_common.js | 54 -- src/static/js/ace2_inner.js | 41 +- src/static/js/broadcast.js | 10 +- src/static/js/broadcast_slider.js | 6 +- src/static/js/domline.js | 12 +- src/static/js/linestylefilter.js | 4 +- src/static/js/pluginfw/hooks.js | 7 +- src/static/js/pluginfw/plugins.js | 34 +- src/static/js/timeslider.js | 3 +- src/static/js/underscore.js | 999 ++++++++++++++++++++++++++++++ src/static/js/undomodule.js | 4 +- 13 files changed, 1069 insertions(+), 113 deletions(-) create mode 100644 src/static/js/underscore.js diff --git a/src/package.json b/src/package.json index b6cdd5df..6253ecb1 100644 --- a/src/package.json +++ b/src/package.json @@ -23,7 +23,8 @@ "log4js" : "0.4.1", "jsdom-nocontextifiy" : "0.2.10", "async-stacktrace" : "0.0.2", - "npm" : "1.1" + "npm" : "1.1", + "underscore" : "1.3.1" }, "devDependencies": { "jshint" : "*" diff --git a/src/static/js/ace.js b/src/static/js/ace.js index 1306dba0..685d45df 100644 --- a/src/static/js/ace.js +++ b/src/static/js/ace.js @@ -29,6 +29,7 @@ Ace2Editor.registry = { }; var hooks = require('./pluginfw/hooks'); +var _ = require('./underscore'); function Ace2Editor() { @@ -70,7 +71,7 @@ function Ace2Editor() function doActionsPendingInit() { - $.each(actionsPendingInit, function(i,fn){ + _.each(actionsPendingInit, function(fn,i){ fn() }); actionsPendingInit = []; @@ -87,7 +88,7 @@ function Ace2Editor() 'setUserChangeNotificationCallback', 'setAuthorInfo', 'setAuthorSelectionRange', 'callWithAce', 'execCommand', 'replaceRange']; - $.each(aceFunctionsPendingInit, function(i,fnName){ + _.each(aceFunctionsPendingInit, function(fnName,i){ var prefix = 'ace_'; var name = prefix + fnName; editor[fnName] = pendingInit(function(){ diff --git a/src/static/js/ace2_common.js b/src/static/js/ace2_common.js index 41fb320d..8a7d16ee 100644 --- a/src/static/js/ace2_common.js +++ b/src/static/js/ace2_common.js @@ -33,56 +33,6 @@ function object(o) f.prototype = o; return new f(); } - -function extend(obj, props) -{ - for (var p in props) - { - obj[p] = props[p]; - } - return obj; -} - - -var forEachImpl = function(fn){ - for (var i = 0; i < this.length; i++) - { - var result = fn(this[i], i, this); - } -} - -function mapImpl(fn) -{ - var result = []; - - for (var i = 0; i < this.length; i++) - { - if (fn) result.push(fn(this[i], i, this)); - else result.push(this[i]); - } - - return result; -} - -// From underscore.js -var keysImpl =function(obj) { - if (obj !== Object(obj)) throw new TypeError('Invalid object'); - var keys = []; - for (var key in obj) if (obj.hasOwnProperty(key)) keys.push(key); - - return keys; -}; - -Array.prototype.forEach = Array.prototype.forEach || forEachImpl; -Array.prototype.each = Array.prototype.each || forEachImpl; -Array.prototype.map = Array.prototype.map || mapImpl; -Object.keys = Object.keys || keysImpl; - -function isArray(testObject) -{ - return testObject && typeof testObject === 'object' && !(testObject.propertyIsEnumerable('length')) && typeof testObject.length === 'number'; -} - var userAgent = (((function () {return this;})().navigator || {}).userAgent || 'node-js').toLowerCase(); // Figure out what browser is being used (stolen from jquery 1.2.1) @@ -144,12 +94,9 @@ function htmlPrettyEscape(str) } var noop = function(){}; -var identity = function(x){return x}; exports.isNodeText = isNodeText; exports.object = object; -exports.extend = extend; -exports.isArray = isArray; exports.browser = browser; exports.getAssoc = getAssoc; exports.setAssoc = setAssoc; @@ -157,4 +104,3 @@ exports.binarySearch = binarySearch; exports.binarySearchInfinite = binarySearchInfinite; exports.htmlPrettyEscape = htmlPrettyEscape; exports.noop = noop; -exports.identity = identity; diff --git a/src/static/js/ace2_inner.js b/src/static/js/ace2_inner.js index d365c137..a50ec996 100644 --- a/src/static/js/ace2_inner.js +++ b/src/static/js/ace2_inner.js @@ -19,23 +19,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -var editor, $, jQuery, plugins, Ace2Common; +var editor, _, $, jQuery, plugins, Ace2Common; Ace2Common = require('./ace2_common'); plugins = require('ep_etherpad-lite/static/js/pluginfw/plugins'); $ = jQuery = require('./rjquery').$; +_ = require("./underscore"); var isNodeText = Ace2Common.isNodeText, - object = Ace2Common.object, - extend = Ace2Common.extend, browser = Ace2Common.browser, getAssoc = Ace2Common.getAssoc, setAssoc = Ace2Common.setAssoc, isTextNode = Ace2Common.isTextNode, - forEach = Ace2Common.forEach, - map = Ace2Common.map, binarySearchInfinite = Ace2Common.binarySearchInfinite, htmlPrettyEscape = Ace2Common.htmlPrettyEscape, noop = Ace2Common.noop; @@ -686,7 +683,7 @@ function Ace2Inner(){ } else { - lines = text.split('\n').map(textify); + lines = _.map(text.split('\n'), textify); } var newText = "\n"; if (lines.length > 0) @@ -1622,7 +1619,7 @@ function Ace2Inner(){ } //var fragment = magicdom.wrapDom(document.createDocumentFragment()); domInsertsNeeded.push([nodeToAddAfter, lineNodeInfos]); - dirtyNodes.forEach(function(n){ + _.each(dirtyNodes,function(n){ toDeleteAtEnd.push(n); }); var spliceHints = {}; @@ -1644,7 +1641,7 @@ function Ace2Inner(){ // update the representation p.mark("splice"); - splicesToDo.forEach(function(splice) + _.each(splicesToDo, function(splice) { doIncorpLineSplice(splice[0], splice[1], splice[2], splice[3], splice[4]); }); @@ -1654,14 +1651,14 @@ function Ace2Inner(){ //var isTimeUp = newTimeLimit(100); // do DOM inserts p.mark("insert"); - domInsertsNeeded.forEach(function(ins) + _.each(domInsertsNeeded,function(ins) { insertDomLines(ins[0], ins[1], isTimeUp); }); p.mark("del"); // delete old dom nodes - toDeleteAtEnd.forEach(function(n) + _.each(toDeleteAtEnd,function(n) { //var id = n.uniqueId(); // parent of n may not be "root" in IE due to non-tree-shaped DOM (wtf) @@ -1771,7 +1768,7 @@ function Ace2Inner(){ var charEnd = rep.lines.offsetOfEntry(endEntry) + endEntry.width; //rep.lexer.lexCharRange([charStart, charEnd], isTimeUp); - infoStructs.forEach(function(info) + _.each(infoStructs, function(info) { var p2 = PROFILER("insertLine", false); var node = info.node; @@ -2083,7 +2080,7 @@ function Ace2Inner(){ splice: function(start, numRemoved, newLinesVA) { var args = Array.prototype.slice.call(arguments, 2); - domAndRepSplice(start, numRemoved, args.map(function(s){ return s.slice(0, -1); }), null); + domAndRepSplice(start, numRemoved, _.map(args, function(s){ return s.slice(0, -1); }), null); }, get: function(i) { @@ -2095,7 +2092,7 @@ function Ace2Inner(){ }, slice_notused: function(start, end) { - return rep.lines.slice(start, end).map(function(e) + return _.map(rep.lines.slice(start, end), function(e) { return e.text + '\n'; }); @@ -2128,7 +2125,7 @@ function Ace2Inner(){ } } - var lineEntries = newLineStrings.map(createDomLineEntry); + var lineEntries = _.map(newLineStrings, createDomLineEntry); doRepLineSplice(startLine, deleteCount, lineEntries); @@ -2139,12 +2136,12 @@ function Ace2Inner(){ } else nodeToAddAfter = null; - insertDomLines(nodeToAddAfter, lineEntries.map(function(entry) + insertDomLines(nodeToAddAfter, _.map(lineEntries, function(entry) { return entry.domInfo; }), isTimeUp); - keysToDelete.forEach(function(k) + _.each(keysToDelete, function(k) { var n = doc.getElementById(k); n.parentNode.removeChild(n); @@ -2464,7 +2461,7 @@ function Ace2Inner(){ function doRepLineSplice(startLine, deleteCount, newLineEntries) { - newLineEntries.forEach(function(entry) + _.each(newLineEntries, function(entry) { entry.width = entry.text.length + 1; }); @@ -2479,7 +2476,7 @@ function Ace2Inner(){ currentCallStack.repChanged = true; var newRegionEnd = rep.lines.offsetOfIndex(startLine + newLineEntries.length); - var newText = newLineEntries.map(function(e) + var newText = _.map(newLineEntries, function(e) { return e.text + '\n'; }).join(''); @@ -2509,7 +2506,7 @@ function Ace2Inner(){ selEndHintChar = rep.lines.offsetOfIndex(hints.selEnd[0]) + hints.selEnd[1] - oldRegionStart; } - var newText = newLineEntries.map(function(e) + var newText = _.map(newLineEntries, function(e) { return e.text + '\n'; }).join(''); @@ -3050,7 +3047,7 @@ function Ace2Inner(){ { // returns index of cleanRange containing i, or -1 if none var answer = -1; - cleanRanges.forEach(function(r, idx) + _.each(cleanRanges ,function(r, idx) { if (i >= r[1]) return false; // keep looking if (i < r[0]) return true; // not found, stop looking @@ -3843,7 +3840,7 @@ function Ace2Inner(){ function getRepHTML() { - return rep.lines.slice().map(function(entry) + return _.map(rep.lines.slice(), function(entry) { var text = entry.text; var content; @@ -4582,7 +4579,7 @@ function Ace2Inner(){ function teardown() { - _teardownActions.forEach(function(a) + _.each(_teardownActions, function(a) { a(); }); diff --git a/src/static/js/broadcast.js b/src/static/js/broadcast.js index 395e3f15..f8b6341d 100644 --- a/src/static/js/broadcast.js +++ b/src/static/js/broadcast.js @@ -26,7 +26,7 @@ var AttribPool = require('./AttributePoolFactory').createAttributePool; var Changeset = require('./Changeset'); var linestylefilter = require('./linestylefilter').linestylefilter; var colorutils = require('./colorutils').colorutils; -var Ace2Common = require('./ace2_common'); +var _ = require('./underscore'); // These parameters were global, now they are injected. A reference to the // Timeslider controller would probably be more appropriate. @@ -152,7 +152,7 @@ function loadBroadcastJS(socket, sendSocketMsg, fireWhenAllScriptsAreLoaded, Bro // splice the lines splice: function(start, numRemoved, newLinesVA) { - var newLines = Array.prototype.slice.call(arguments, 2).map(function(s) { + var newLines = _.map(Array.prototype.slice.call(arguments, 2), function(s) { return s; }); @@ -275,7 +275,7 @@ function loadBroadcastJS(socket, sendSocketMsg, fireWhenAllScriptsAreLoaded, Bro debugLog('Time Delta: ', timeDelta) updateTimer(); - var authors = padContents.getActiveAuthors().map(function(name) + var authors = _.map(padContents.getActiveAuthors(), function(name) { return authorData[name]; }); @@ -381,7 +381,7 @@ function loadBroadcastJS(socket, sendSocketMsg, fireWhenAllScriptsAreLoaded, Bro changesetLoader.queueUp(start, 1, update); } - var authors = padContents.getActiveAuthors().map(function(name){ + var authors = _.map(padContents.getActiveAuthors(), function(name){ return authorData[name]; }); BroadcastSlider.setAuthors(authors); @@ -524,7 +524,7 @@ function loadBroadcastJS(socket, sendSocketMsg, fireWhenAllScriptsAreLoaded, Bro authorMap[obj.author] = obj.data; receiveAuthorData(authorMap); - var authors = padContents.getActiveAuthors().map(function(name) { + var authors = _.map(padContents.getActiveAuthors(), function(name) { return authorData[name]; }); diff --git a/src/static/js/broadcast_slider.js b/src/static/js/broadcast_slider.js index c40e6c63..f88eb5dd 100644 --- a/src/static/js/broadcast_slider.js +++ b/src/static/js/broadcast_slider.js @@ -22,7 +22,7 @@ // These parameters were global, now they are injected. A reference to the // Timeslider controller would probably be more appropriate. -require('./ace2_common'); +var _ = require('./underscore'); function loadBroadcastSliderJS(fireWhenAllScriptsAreLoaded) { @@ -175,7 +175,7 @@ function loadBroadcastSliderJS(fireWhenAllScriptsAreLoaded) $("#authorstable").empty(); var numAnonymous = 0; var numNamed = 0; - authors.forEach(function(author) + _.each(authors, function(author) { if (author.name) { @@ -469,7 +469,7 @@ function loadBroadcastSliderJS(fireWhenAllScriptsAreLoaded) $("#timeslider").show(); setSliderLength(clientVars.totalRevs); setSliderPosition(clientVars.revNum); - clientVars.savedRevisions.forEach(function(revision) + _.each(clientVars.savedRevisions, function(revision) { addSavedRevision(revision.revNum, revision); }) diff --git a/src/static/js/domline.js b/src/static/js/domline.js index d1a65260..d4f52a3c 100644 --- a/src/static/js/domline.js +++ b/src/static/js/domline.js @@ -28,9 +28,11 @@ var Security = require('./security'); var hooks = require('./pluginfw/hooks'); +var _ = require('./underscore'); + var Ace2Common = require('./ace2_common'); var noop = Ace2Common.noop; -var identity = Ace2Common.identity; + var domline = {}; @@ -88,8 +90,8 @@ domline.createDomLine = function(nonEmpty, doesWrap, optBrowser, optDocument) return domline.processSpaces(s, doesWrap); } - var perTextNodeProcess = (doesWrap ? identity : processSpaces); - var perHtmlLineProcess = (doesWrap ? processSpaces : identity); + var perTextNodeProcess = (doesWrap ? _.identity : processSpaces); + var perHtmlLineProcess = (doesWrap ? processSpaces : _.identity); var lineClass = 'ace-line'; result.appendSpan = function(txt, cls) { @@ -141,10 +143,10 @@ domline.createDomLine = function(nonEmpty, doesWrap, optBrowser, optDocument) var extraOpenTags = ""; var extraCloseTags = ""; - hooks.callAll("aceCreateDomLine", { + _.map(hooks.callAll("aceCreateDomLine", { domline: domline, cls: cls - }).map(function(modifier) + }), function(modifier) { cls = modifier.cls; extraOpenTags = extraOpenTags + modifier.extraOpenTags; diff --git a/src/static/js/linestylefilter.js b/src/static/js/linestylefilter.js index f1116ecc..f328bd56 100644 --- a/src/static/js/linestylefilter.js +++ b/src/static/js/linestylefilter.js @@ -30,8 +30,8 @@ var Changeset = require('./Changeset'); var hooks = require('./pluginfw/hooks'); - var linestylefilter = {}; +var _ = require('./underscore'); linestylefilter.ATTRIB_CLASSES = { 'bold': 'tag:b', @@ -301,7 +301,7 @@ linestylefilter.getFilterStack = function(lineText, textAndClassFunc, browser) linestylefilter: linestylefilter, browser: browser }); - hookFilters.map(function(hookFilter) + _.map(hookFilters ,function(hookFilter) { func = hookFilter(lineText, func); }); diff --git a/src/static/js/pluginfw/hooks.js b/src/static/js/pluginfw/hooks.js index 1b09a6e5..dbf8e583 100644 --- a/src/static/js/pluginfw/hooks.js +++ b/src/static/js/pluginfw/hooks.js @@ -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("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); })); } diff --git a/src/static/js/pluginfw/plugins.js b/src/static/js/pluginfw/plugins.js index 9e85f6fc..0745b698 100644 --- a/src/static/js/pluginfw/plugins.js +++ b/src/static/js/pluginfw/plugins.js @@ -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,10 +12,12 @@ if (!exports.isClient) { var fs = require("fs"); var tsort = require("./tsort"); var util = require("util"); + _ = require("underscore"); }else{ - require("../ace2_common.js"); - var $, jQuery; + var $, jQuery $ = jQuery = require("ep_etherpad-lite/static/js/rjquery").$; + _ = require("ep_etherpad-lite/static/js/underscore"); + } exports.prefix = 'ep_'; @@ -30,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); }); }); @@ -50,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; @@ -58,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]); @@ -114,7 +118,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]; } @@ -141,7 +145,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; @@ -156,11 +160,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) { @@ -170,6 +174,8 @@ exports.partsToParentChildList = function (parts) { return res; } + +// Used only in Node, so no need for _ exports.sortParts = function(parts) { return tsort( exports.partsToParentChildList(parts) diff --git a/src/static/js/timeslider.js b/src/static/js/timeslider.js index 579dcb60..5d173276 100644 --- a/src/static/js/timeslider.js +++ b/src/static/js/timeslider.js @@ -29,6 +29,7 @@ require('./undo-xpopup'); var createCookie = require('./pad_utils').createCookie; var readCookie = require('./pad_utils').readCookie; var randomString = require('./pad_utils').randomString; +var _ = require('./underscore'); var socket, token, padId, export_links; @@ -138,7 +139,7 @@ function handleClientVars(message) var export_rev_regex = /(\/\d+)?\/export/ BroadcastSlider.onSlider(function(revno) { - export_links.each(function() + _.each(export_links, function() { this.setAttribute('href', this.href.replace(export_rev_regex, '/' + revno + '/export')); }); diff --git a/src/static/js/underscore.js b/src/static/js/underscore.js new file mode 100644 index 00000000..208d4cd8 --- /dev/null +++ b/src/static/js/underscore.js @@ -0,0 +1,999 @@ +// Underscore.js 1.3.1 +// (c) 2009-2012 Jeremy Ashkenas, DocumentCloud Inc. +// Underscore is freely distributable under the MIT license. +// Portions of Underscore are inspired or borrowed from Prototype, +// Oliver Steele's Functional, and John Resig's Micro-Templating. +// For all details and documentation: +// http://documentcloud.github.com/underscore + +(function() { + + // Baseline setup + // -------------- + + // Establish the root object, `window` in the browser, or `global` on the server. + var root = this; + + // Save the previous value of the `_` variable. + var previousUnderscore = root._; + + // Establish the object that gets returned to break out of a loop iteration. + var breaker = {}; + + // Save bytes in the minified (but not gzipped) version: + var ArrayProto = Array.prototype, ObjProto = Object.prototype, FuncProto = Function.prototype; + + // Create quick reference variables for speed access to core prototypes. + var slice = ArrayProto.slice, + unshift = ArrayProto.unshift, + toString = ObjProto.toString, + hasOwnProperty = ObjProto.hasOwnProperty; + + // All **ECMAScript 5** native function implementations that we hope to use + // are declared here. + var + nativeForEach = ArrayProto.forEach, + nativeMap = ArrayProto.map, + nativeReduce = ArrayProto.reduce, + nativeReduceRight = ArrayProto.reduceRight, + nativeFilter = ArrayProto.filter, + nativeEvery = ArrayProto.every, + nativeSome = ArrayProto.some, + nativeIndexOf = ArrayProto.indexOf, + nativeLastIndexOf = ArrayProto.lastIndexOf, + nativeIsArray = Array.isArray, + nativeKeys = Object.keys, + nativeBind = FuncProto.bind; + + // Create a safe reference to the Underscore object for use below. + var _ = function(obj) { return new wrapper(obj); }; + + // Export the Underscore object for **Node.js**, with + // backwards-compatibility for the old `require()` API. If we're in + // the browser, add `_` as a global object via a string identifier, + // for Closure Compiler "advanced" mode. + if (typeof exports !== 'undefined') { + if (typeof module !== 'undefined' && module.exports) { + exports = module.exports = _; + } + exports._ = _; + } else { + root['_'] = _; + } + + // Current version. + _.VERSION = '1.3.1'; + + // Collection Functions + // -------------------- + + // The cornerstone, an `each` implementation, aka `forEach`. + // Handles objects with the built-in `forEach`, arrays, and raw objects. + // Delegates to **ECMAScript 5**'s native `forEach` if available. + var each = _.each = _.forEach = function(obj, iterator, context) { + if (obj == null) return; + if (nativeForEach && obj.forEach === nativeForEach) { + obj.forEach(iterator, context); + } else if (obj.length === +obj.length) { + for (var i = 0, l = obj.length; i < l; i++) { + if (i in obj && iterator.call(context, obj[i], i, obj) === breaker) return; + } + } else { + for (var key in obj) { + if (_.has(obj, key)) { + if (iterator.call(context, obj[key], key, obj) === breaker) return; + } + } + } + }; + + // Return the results of applying the iterator to each element. + // Delegates to **ECMAScript 5**'s native `map` if available. + _.map = _.collect = function(obj, iterator, context) { + var results = []; + if (obj == null) return results; + if (nativeMap && obj.map === nativeMap) return obj.map(iterator, context); + each(obj, function(value, index, list) { + results[results.length] = iterator.call(context, value, index, list); + }); + if (obj.length === +obj.length) results.length = obj.length; + return results; + }; + + // **Reduce** builds up a single result from a list of values, aka `inject`, + // or `foldl`. Delegates to **ECMAScript 5**'s native `reduce` if available. + _.reduce = _.foldl = _.inject = function(obj, iterator, memo, context) { + var initial = arguments.length > 2; + if (obj == null) obj = []; + if (nativeReduce && obj.reduce === nativeReduce) { + if (context) iterator = _.bind(iterator, context); + return initial ? obj.reduce(iterator, memo) : obj.reduce(iterator); + } + each(obj, function(value, index, list) { + if (!initial) { + memo = value; + initial = true; + } else { + memo = iterator.call(context, memo, value, index, list); + } + }); + if (!initial) throw new TypeError('Reduce of empty array with no initial value'); + return memo; + }; + + // The right-associative version of reduce, also known as `foldr`. + // Delegates to **ECMAScript 5**'s native `reduceRight` if available. + _.reduceRight = _.foldr = function(obj, iterator, memo, context) { + var initial = arguments.length > 2; + if (obj == null) obj = []; + if (nativeReduceRight && obj.reduceRight === nativeReduceRight) { + if (context) iterator = _.bind(iterator, context); + return initial ? obj.reduceRight(iterator, memo) : obj.reduceRight(iterator); + } + var reversed = _.toArray(obj).reverse(); + if (context && !initial) iterator = _.bind(iterator, context); + return initial ? _.reduce(reversed, iterator, memo, context) : _.reduce(reversed, iterator); + }; + + // Return the first value which passes a truth test. Aliased as `detect`. + _.find = _.detect = function(obj, iterator, context) { + var result; + any(obj, function(value, index, list) { + if (iterator.call(context, value, index, list)) { + result = value; + return true; + } + }); + return result; + }; + + // Return all the elements that pass a truth test. + // Delegates to **ECMAScript 5**'s native `filter` if available. + // Aliased as `select`. + _.filter = _.select = function(obj, iterator, context) { + var results = []; + if (obj == null) return results; + if (nativeFilter && obj.filter === nativeFilter) return obj.filter(iterator, context); + each(obj, function(value, index, list) { + if (iterator.call(context, value, index, list)) results[results.length] = value; + }); + return results; + }; + + // Return all the elements for which a truth test fails. + _.reject = function(obj, iterator, context) { + var results = []; + if (obj == null) return results; + each(obj, function(value, index, list) { + if (!iterator.call(context, value, index, list)) results[results.length] = value; + }); + return results; + }; + + // Determine whether all of the elements match a truth test. + // Delegates to **ECMAScript 5**'s native `every` if available. + // Aliased as `all`. + _.every = _.all = function(obj, iterator, context) { + var result = true; + if (obj == null) return result; + if (nativeEvery && obj.every === nativeEvery) return obj.every(iterator, context); + each(obj, function(value, index, list) { + if (!(result = result && iterator.call(context, value, index, list))) return breaker; + }); + return result; + }; + + // Determine if at least one element in the object matches a truth test. + // Delegates to **ECMAScript 5**'s native `some` if available. + // Aliased as `any`. + var any = _.some = _.any = function(obj, iterator, context) { + iterator || (iterator = _.identity); + var result = false; + if (obj == null) return result; + if (nativeSome && obj.some === nativeSome) return obj.some(iterator, context); + each(obj, function(value, index, list) { + if (result || (result = iterator.call(context, value, index, list))) return breaker; + }); + return !!result; + }; + + // Determine if a given value is included in the array or object using `===`. + // Aliased as `contains`. + _.include = _.contains = function(obj, target) { + var found = false; + if (obj == null) return found; + if (nativeIndexOf && obj.indexOf === nativeIndexOf) return obj.indexOf(target) != -1; + found = any(obj, function(value) { + return value === target; + }); + return found; + }; + + // Invoke a method (with arguments) on every item in a collection. + _.invoke = function(obj, method) { + var args = slice.call(arguments, 2); + return _.map(obj, function(value) { + return (_.isFunction(method) ? method || value : value[method]).apply(value, args); + }); + }; + + // Convenience version of a common use case of `map`: fetching a property. + _.pluck = function(obj, key) { + return _.map(obj, function(value){ return value[key]; }); + }; + + // Return the maximum element or (element-based computation). + _.max = function(obj, iterator, context) { + if (!iterator && _.isArray(obj)) return Math.max.apply(Math, obj); + if (!iterator && _.isEmpty(obj)) return -Infinity; + var result = {computed : -Infinity}; + each(obj, function(value, index, list) { + var computed = iterator ? iterator.call(context, value, index, list) : value; + computed >= result.computed && (result = {value : value, computed : computed}); + }); + return result.value; + }; + + // Return the minimum element (or element-based computation). + _.min = function(obj, iterator, context) { + if (!iterator && _.isArray(obj)) return Math.min.apply(Math, obj); + if (!iterator && _.isEmpty(obj)) return Infinity; + var result = {computed : Infinity}; + each(obj, function(value, index, list) { + var computed = iterator ? iterator.call(context, value, index, list) : value; + computed < result.computed && (result = {value : value, computed : computed}); + }); + return result.value; + }; + + // Shuffle an array. + _.shuffle = function(obj) { + var shuffled = [], rand; + each(obj, function(value, index, list) { + if (index == 0) { + shuffled[0] = value; + } else { + rand = Math.floor(Math.random() * (index + 1)); + shuffled[index] = shuffled[rand]; + shuffled[rand] = value; + } + }); + return shuffled; + }; + + // Sort the object's values by a criterion produced by an iterator. + _.sortBy = function(obj, iterator, context) { + return _.pluck(_.map(obj, function(value, index, list) { + return { + value : value, + criteria : iterator.call(context, value, index, list) + }; + }).sort(function(left, right) { + var a = left.criteria, b = right.criteria; + return a < b ? -1 : a > b ? 1 : 0; + }), 'value'); + }; + + // Groups the object's values by a criterion. Pass either a string attribute + // to group by, or a function that returns the criterion. + _.groupBy = function(obj, val) { + var result = {}; + var iterator = _.isFunction(val) ? val : function(obj) { return obj[val]; }; + each(obj, function(value, index) { + var key = iterator(value, index); + (result[key] || (result[key] = [])).push(value); + }); + return result; + }; + + // Use a comparator function to figure out at what index an object should + // be inserted so as to maintain order. Uses binary search. + _.sortedIndex = function(array, obj, iterator) { + iterator || (iterator = _.identity); + var low = 0, high = array.length; + while (low < high) { + var mid = (low + high) >> 1; + iterator(array[mid]) < iterator(obj) ? low = mid + 1 : high = mid; + } + return low; + }; + + // Safely convert anything iterable into a real, live array. + _.toArray = function(iterable) { + if (!iterable) return []; + if (iterable.toArray) return iterable.toArray(); + if (_.isArray(iterable)) return slice.call(iterable); + if (_.isArguments(iterable)) return slice.call(iterable); + return _.values(iterable); + }; + + // Return the number of elements in an object. + _.size = function(obj) { + return _.toArray(obj).length; + }; + + // Array Functions + // --------------- + + // Get the first element of an array. Passing **n** will return the first N + // values in the array. Aliased as `head`. The **guard** check allows it to work + // with `_.map`. + _.first = _.head = function(array, n, guard) { + return (n != null) && !guard ? slice.call(array, 0, n) : array[0]; + }; + + // Returns everything but the last entry of the array. Especcialy useful on + // the arguments object. Passing **n** will return all the values in + // the array, excluding the last N. The **guard** check allows it to work with + // `_.map`. + _.initial = function(array, n, guard) { + return slice.call(array, 0, array.length - ((n == null) || guard ? 1 : n)); + }; + + // Get the last element of an array. Passing **n** will return the last N + // values in the array. The **guard** check allows it to work with `_.map`. + _.last = function(array, n, guard) { + if ((n != null) && !guard) { + return slice.call(array, Math.max(array.length - n, 0)); + } else { + return array[array.length - 1]; + } + }; + + // Returns everything but the first entry of the array. Aliased as `tail`. + // Especially useful on the arguments object. Passing an **index** will return + // the rest of the values in the array from that index onward. The **guard** + // check allows it to work with `_.map`. + _.rest = _.tail = function(array, index, guard) { + return slice.call(array, (index == null) || guard ? 1 : index); + }; + + // Trim out all falsy values from an array. + _.compact = function(array) { + return _.filter(array, function(value){ return !!value; }); + }; + + // Return a completely flattened version of an array. + _.flatten = function(array, shallow) { + return _.reduce(array, function(memo, value) { + if (_.isArray(value)) return memo.concat(shallow ? value : _.flatten(value)); + memo[memo.length] = value; + return memo; + }, []); + }; + + // Return a version of the array that does not contain the specified value(s). + _.without = function(array) { + return _.difference(array, slice.call(arguments, 1)); + }; + + // Produce a duplicate-free version of the array. If the array has already + // been sorted, you have the option of using a faster algorithm. + // Aliased as `unique`. + _.uniq = _.unique = function(array, isSorted, iterator) { + var initial = iterator ? _.map(array, iterator) : array; + var result = []; + _.reduce(initial, function(memo, el, i) { + if (0 == i || (isSorted === true ? _.last(memo) != el : !_.include(memo, el))) { + memo[memo.length] = el; + result[result.length] = array[i]; + } + return memo; + }, []); + return result; + }; + + // Produce an array that contains the union: each distinct element from all of + // the passed-in arrays. + _.union = function() { + return _.uniq(_.flatten(arguments, true)); + }; + + // Produce an array that contains every item shared between all the + // passed-in arrays. (Aliased as "intersect" for back-compat.) + _.intersection = _.intersect = function(array) { + var rest = slice.call(arguments, 1); + return _.filter(_.uniq(array), function(item) { + return _.every(rest, function(other) { + return _.indexOf(other, item) >= 0; + }); + }); + }; + + // Take the difference between one array and a number of other arrays. + // Only the elements present in just the first array will remain. + _.difference = function(array) { + var rest = _.flatten(slice.call(arguments, 1)); + return _.filter(array, function(value){ return !_.include(rest, value); }); + }; + + // Zip together multiple lists into a single array -- elements that share + // an index go together. + _.zip = function() { + var args = slice.call(arguments); + var length = _.max(_.pluck(args, 'length')); + var results = new Array(length); + for (var i = 0; i < length; i++) results[i] = _.pluck(args, "" + i); + return results; + }; + + // If the browser doesn't supply us with indexOf (I'm looking at you, **MSIE**), + // we need this function. Return the position of the first occurrence of an + // item in an array, or -1 if the item is not included in the array. + // Delegates to **ECMAScript 5**'s native `indexOf` if available. + // If the array is large and already in sort order, pass `true` + // for **isSorted** to use binary search. + _.indexOf = function(array, item, isSorted) { + if (array == null) return -1; + var i, l; + if (isSorted) { + i = _.sortedIndex(array, item); + return array[i] === item ? i : -1; + } + if (nativeIndexOf && array.indexOf === nativeIndexOf) return array.indexOf(item); + for (i = 0, l = array.length; i < l; i++) if (i in array && array[i] === item) return i; + return -1; + }; + + // Delegates to **ECMAScript 5**'s native `lastIndexOf` if available. + _.lastIndexOf = function(array, item) { + if (array == null) return -1; + if (nativeLastIndexOf && array.lastIndexOf === nativeLastIndexOf) return array.lastIndexOf(item); + var i = array.length; + while (i--) if (i in array && array[i] === item) return i; + return -1; + }; + + // Generate an integer Array containing an arithmetic progression. A port of + // the native Python `range()` function. See + // [the Python documentation](http://docs.python.org/library/functions.html#range). + _.range = function(start, stop, step) { + if (arguments.length <= 1) { + stop = start || 0; + start = 0; + } + step = arguments[2] || 1; + + var len = Math.max(Math.ceil((stop - start) / step), 0); + var idx = 0; + var range = new Array(len); + + while(idx < len) { + range[idx++] = start; + start += step; + } + + return range; + }; + + // Function (ahem) Functions + // ------------------ + + // Reusable constructor function for prototype setting. + var ctor = function(){}; + + // Create a function bound to a given object (assigning `this`, and arguments, + // optionally). Binding with arguments is also known as `curry`. + // Delegates to **ECMAScript 5**'s native `Function.bind` if available. + // We check for `func.bind` first, to fail fast when `func` is undefined. + _.bind = function bind(func, context) { + var bound, args; + if (func.bind === nativeBind && nativeBind) return nativeBind.apply(func, slice.call(arguments, 1)); + if (!_.isFunction(func)) throw new TypeError; + args = slice.call(arguments, 2); + return bound = function() { + if (!(this instanceof bound)) return func.apply(context, args.concat(slice.call(arguments))); + ctor.prototype = func.prototype; + var self = new ctor; + var result = func.apply(self, args.concat(slice.call(arguments))); + if (Object(result) === result) return result; + return self; + }; + }; + + // Bind all of an object's methods to that object. Useful for ensuring that + // all callbacks defined on an object belong to it. + _.bindAll = function(obj) { + var funcs = slice.call(arguments, 1); + if (funcs.length == 0) funcs = _.functions(obj); + each(funcs, function(f) { obj[f] = _.bind(obj[f], obj); }); + return obj; + }; + + // Memoize an expensive function by storing its results. + _.memoize = function(func, hasher) { + var memo = {}; + hasher || (hasher = _.identity); + return function() { + var key = hasher.apply(this, arguments); + return _.has(memo, key) ? memo[key] : (memo[key] = func.apply(this, arguments)); + }; + }; + + // Delays a function for the given number of milliseconds, and then calls + // it with the arguments supplied. + _.delay = function(func, wait) { + var args = slice.call(arguments, 2); + return setTimeout(function(){ return func.apply(func, args); }, wait); + }; + + // Defers a function, scheduling it to run after the current call stack has + // cleared. + _.defer = function(func) { + return _.delay.apply(_, [func, 1].concat(slice.call(arguments, 1))); + }; + + // Returns a function, that, when invoked, will only be triggered at most once + // during a given window of time. + _.throttle = function(func, wait) { + var context, args, timeout, throttling, more; + var whenDone = _.debounce(function(){ more = throttling = false; }, wait); + return function() { + context = this; args = arguments; + var later = function() { + timeout = null; + if (more) func.apply(context, args); + whenDone(); + }; + if (!timeout) timeout = setTimeout(later, wait); + if (throttling) { + more = true; + } else { + func.apply(context, args); + } + whenDone(); + throttling = true; + }; + }; + + // Returns a function, that, as long as it continues to be invoked, will not + // be triggered. The function will be called after it stops being called for + // N milliseconds. + _.debounce = function(func, wait) { + var timeout; + return function() { + var context = this, args = arguments; + var later = function() { + timeout = null; + func.apply(context, args); + }; + clearTimeout(timeout); + timeout = setTimeout(later, wait); + }; + }; + + // Returns a function that will be executed at most one time, no matter how + // often you call it. Useful for lazy initialization. + _.once = function(func) { + var ran = false, memo; + return function() { + if (ran) return memo; + ran = true; + return memo = func.apply(this, arguments); + }; + }; + + // Returns the first function passed as an argument to the second, + // allowing you to adjust arguments, run code before and after, and + // conditionally execute the original function. + _.wrap = function(func, wrapper) { + return function() { + var args = [func].concat(slice.call(arguments, 0)); + return wrapper.apply(this, args); + }; + }; + + // Returns a function that is the composition of a list of functions, each + // consuming the return value of the function that follows. + _.compose = function() { + var funcs = arguments; + return function() { + var args = arguments; + for (var i = funcs.length - 1; i >= 0; i--) { + args = [funcs[i].apply(this, args)]; + } + return args[0]; + }; + }; + + // Returns a function that will only be executed after being called N times. + _.after = function(times, func) { + if (times <= 0) return func(); + return function() { + if (--times < 1) { return func.apply(this, arguments); } + }; + }; + + // Object Functions + // ---------------- + + // Retrieve the names of an object's properties. + // Delegates to **ECMAScript 5**'s native `Object.keys` + _.keys = nativeKeys || function(obj) { + if (obj !== Object(obj)) throw new TypeError('Invalid object'); + var keys = []; + for (var key in obj) if (_.has(obj, key)) keys[keys.length] = key; + return keys; + }; + + // Retrieve the values of an object's properties. + _.values = function(obj) { + return _.map(obj, _.identity); + }; + + // Return a sorted list of the function names available on the object. + // Aliased as `methods` + _.functions = _.methods = function(obj) { + var names = []; + for (var key in obj) { + if (_.isFunction(obj[key])) names.push(key); + } + return names.sort(); + }; + + // Extend a given object with all the properties in passed-in object(s). + _.extend = function(obj) { + each(slice.call(arguments, 1), function(source) { + for (var prop in source) { + obj[prop] = source[prop]; + } + }); + return obj; + }; + + // Fill in a given object with default properties. + _.defaults = function(obj) { + each(slice.call(arguments, 1), function(source) { + for (var prop in source) { + if (obj[prop] == null) obj[prop] = source[prop]; + } + }); + return obj; + }; + + // Create a (shallow-cloned) duplicate of an object. + _.clone = function(obj) { + if (!_.isObject(obj)) return obj; + return _.isArray(obj) ? obj.slice() : _.extend({}, obj); + }; + + // Invokes interceptor with the obj, and then returns obj. + // The primary purpose of this method is to "tap into" a method chain, in + // order to perform operations on intermediate results within the chain. + _.tap = function(obj, interceptor) { + interceptor(obj); + return obj; + }; + + // Internal recursive comparison function. + function eq(a, b, stack) { + // Identical objects are equal. `0 === -0`, but they aren't identical. + // See the Harmony `egal` proposal: http://wiki.ecmascript.org/doku.php?id=harmony:egal. + if (a === b) return a !== 0 || 1 / a == 1 / b; + // A strict comparison is necessary because `null == undefined`. + if (a == null || b == null) return a === b; + // Unwrap any wrapped objects. + if (a._chain) a = a._wrapped; + if (b._chain) b = b._wrapped; + // Invoke a custom `isEqual` method if one is provided. + if (a.isEqual && _.isFunction(a.isEqual)) return a.isEqual(b); + if (b.isEqual && _.isFunction(b.isEqual)) return b.isEqual(a); + // Compare `[[Class]]` names. + var className = toString.call(a); + if (className != toString.call(b)) return false; + switch (className) { + // Strings, numbers, dates, and booleans are compared by value. + case '[object String]': + // Primitives and their corresponding object wrappers are equivalent; thus, `"5"` is + // equivalent to `new String("5")`. + return a == String(b); + case '[object Number]': + // `NaN`s are equivalent, but non-reflexive. An `egal` comparison is performed for + // other numeric values. + return a != +a ? b != +b : (a == 0 ? 1 / a == 1 / b : a == +b); + case '[object Date]': + case '[object Boolean]': + // Coerce dates and booleans to numeric primitive values. Dates are compared by their + // millisecond representations. Note that invalid dates with millisecond representations + // of `NaN` are not equivalent. + return +a == +b; + // RegExps are compared by their source patterns and flags. + case '[object RegExp]': + return a.source == b.source && + a.global == b.global && + a.multiline == b.multiline && + a.ignoreCase == b.ignoreCase; + } + if (typeof a != 'object' || typeof b != 'object') return false; + // Assume equality for cyclic structures. The algorithm for detecting cyclic + // structures is adapted from ES 5.1 section 15.12.3, abstract operation `JO`. + var length = stack.length; + while (length--) { + // Linear search. Performance is inversely proportional to the number of + // unique nested structures. + if (stack[length] == a) return true; + } + // Add the first object to the stack of traversed objects. + stack.push(a); + var size = 0, result = true; + // Recursively compare objects and arrays. + if (className == '[object Array]') { + // Compare array lengths to determine if a deep comparison is necessary. + size = a.length; + result = size == b.length; + if (result) { + // Deep compare the contents, ignoring non-numeric properties. + while (size--) { + // Ensure commutative equality for sparse arrays. + if (!(result = size in a == size in b && eq(a[size], b[size], stack))) break; + } + } + } else { + // Objects with different constructors are not equivalent. + if ('constructor' in a != 'constructor' in b || a.constructor != b.constructor) return false; + // Deep compare objects. + for (var key in a) { + if (_.has(a, key)) { + // Count the expected number of properties. + size++; + // Deep compare each member. + if (!(result = _.has(b, key) && eq(a[key], b[key], stack))) break; + } + } + // Ensure that both objects contain the same number of properties. + if (result) { + for (key in b) { + if (_.has(b, key) && !(size--)) break; + } + result = !size; + } + } + // Remove the first object from the stack of traversed objects. + stack.pop(); + return result; + } + + // Perform a deep comparison to check if two objects are equal. + _.isEqual = function(a, b) { + return eq(a, b, []); + }; + + // Is a given array, string, or object empty? + // An "empty" object has no enumerable own-properties. + _.isEmpty = function(obj) { + if (_.isArray(obj) || _.isString(obj)) return obj.length === 0; + for (var key in obj) if (_.has(obj, key)) return false; + return true; + }; + + // Is a given value a DOM element? + _.isElement = function(obj) { + return !!(obj && obj.nodeType == 1); + }; + + // Is a given value an array? + // Delegates to ECMA5's native Array.isArray + _.isArray = nativeIsArray || function(obj) { + return toString.call(obj) == '[object Array]'; + }; + + // Is a given variable an object? + _.isObject = function(obj) { + return obj === Object(obj); + }; + + // Is a given variable an arguments object? + _.isArguments = function(obj) { + return toString.call(obj) == '[object Arguments]'; + }; + if (!_.isArguments(arguments)) { + _.isArguments = function(obj) { + return !!(obj && _.has(obj, 'callee')); + }; + } + + // Is a given value a function? + _.isFunction = function(obj) { + return toString.call(obj) == '[object Function]'; + }; + + // Is a given value a string? + _.isString = function(obj) { + return toString.call(obj) == '[object String]'; + }; + + // Is a given value a number? + _.isNumber = function(obj) { + return toString.call(obj) == '[object Number]'; + }; + + // Is the given value `NaN`? + _.isNaN = function(obj) { + // `NaN` is the only value for which `===` is not reflexive. + return obj !== obj; + }; + + // Is a given value a boolean? + _.isBoolean = function(obj) { + return obj === true || obj === false || toString.call(obj) == '[object Boolean]'; + }; + + // Is a given value a date? + _.isDate = function(obj) { + return toString.call(obj) == '[object Date]'; + }; + + // Is the given value a regular expression? + _.isRegExp = function(obj) { + return toString.call(obj) == '[object RegExp]'; + }; + + // Is a given value equal to null? + _.isNull = function(obj) { + return obj === null; + }; + + // Is a given variable undefined? + _.isUndefined = function(obj) { + return obj === void 0; + }; + + // Has own property? + _.has = function(obj, key) { + return hasOwnProperty.call(obj, key); + }; + + // Utility Functions + // ----------------- + + // Run Underscore.js in *noConflict* mode, returning the `_` variable to its + // previous owner. Returns a reference to the Underscore object. + _.noConflict = function() { + root._ = previousUnderscore; + return this; + }; + + // Keep the identity function around for default iterators. + _.identity = function(value) { + return value; + }; + + // Run a function **n** times. + _.times = function (n, iterator, context) { + for (var i = 0; i < n; i++) iterator.call(context, i); + }; + + // Escape a string for HTML interpolation. + _.escape = function(string) { + return (''+string).replace(/&/g, '&').replace(//g, '>').replace(/"/g, '"').replace(/'/g, ''').replace(/\//g,'/'); + }; + + // Add your own custom functions to the Underscore object, ensuring that + // they're correctly added to the OOP wrapper as well. + _.mixin = function(obj) { + each(_.functions(obj), function(name){ + addToWrapper(name, _[name] = obj[name]); + }); + }; + + // Generate a unique integer id (unique within the entire client session). + // Useful for temporary DOM ids. + var idCounter = 0; + _.uniqueId = function(prefix) { + var id = idCounter++; + return prefix ? prefix + id : id; + }; + + // By default, Underscore uses ERB-style template delimiters, change the + // following template settings to use alternative delimiters. + _.templateSettings = { + evaluate : /<%([\s\S]+?)%>/g, + interpolate : /<%=([\s\S]+?)%>/g, + escape : /<%-([\s\S]+?)%>/g + }; + + // When customizing `templateSettings`, if you don't want to define an + // interpolation, evaluation or escaping regex, we need one that is + // guaranteed not to match. + var noMatch = /.^/; + + // Within an interpolation, evaluation, or escaping, remove HTML escaping + // that had been previously added. + var unescape = function(code) { + return code.replace(/\\\\/g, '\\').replace(/\\'/g, "'"); + }; + + // JavaScript micro-templating, similar to John Resig's implementation. + // Underscore templating handles arbitrary delimiters, preserves whitespace, + // and correctly escapes quotes within interpolated code. + _.template = function(str, data) { + var c = _.templateSettings; + var tmpl = 'var __p=[],print=function(){__p.push.apply(__p,arguments);};' + + 'with(obj||{}){__p.push(\'' + + str.replace(/\\/g, '\\\\') + .replace(/'/g, "\\'") + .replace(c.escape || noMatch, function(match, code) { + return "',_.escape(" + unescape(code) + "),'"; + }) + .replace(c.interpolate || noMatch, function(match, code) { + return "'," + unescape(code) + ",'"; + }) + .replace(c.evaluate || noMatch, function(match, code) { + return "');" + unescape(code).replace(/[\r\n\t]/g, ' ') + ";__p.push('"; + }) + .replace(/\r/g, '\\r') + .replace(/\n/g, '\\n') + .replace(/\t/g, '\\t') + + "');}return __p.join('');"; + var func = new Function('obj', '_', tmpl); + if (data) return func(data, _); + return function(data) { + return func.call(this, data, _); + }; + }; + + // Add a "chain" function, which will delegate to the wrapper. + _.chain = function(obj) { + return _(obj).chain(); + }; + + // The OOP Wrapper + // --------------- + + // If Underscore is called as a function, it returns a wrapped object that + // can be used OO-style. This wrapper holds altered versions of all the + // underscore functions. Wrapped objects may be chained. + var wrapper = function(obj) { this._wrapped = obj; }; + + // Expose `wrapper.prototype` as `_.prototype` + _.prototype = wrapper.prototype; + + // Helper function to continue chaining intermediate results. + var result = function(obj, chain) { + return chain ? _(obj).chain() : obj; + }; + + // A method to easily add functions to the OOP wrapper. + var addToWrapper = function(name, func) { + wrapper.prototype[name] = function() { + var args = slice.call(arguments); + unshift.call(args, this._wrapped); + return result(func.apply(_, args), this._chain); + }; + }; + + // Add all of the Underscore functions to the wrapper object. + _.mixin(_); + + // Add all mutator Array functions to the wrapper. + each(['pop', 'push', 'reverse', 'shift', 'sort', 'splice', 'unshift'], function(name) { + var method = ArrayProto[name]; + wrapper.prototype[name] = function() { + var wrapped = this._wrapped; + method.apply(wrapped, arguments); + var length = wrapped.length; + if ((name == 'shift' || name == 'splice') && length === 0) delete wrapped[0]; + return result(wrapped, this._chain); + }; + }); + + // Add all accessor Array functions to the wrapper. + each(['concat', 'join', 'slice'], function(name) { + var method = ArrayProto[name]; + wrapper.prototype[name] = function() { + return result(method.apply(this._wrapped, arguments), this._chain); + }; + }); + + // Start chaining a wrapped Underscore object. + wrapper.prototype.chain = function() { + this._chain = true; + return this; + }; + + // Extracts the result from a wrapped and chained object. + wrapper.prototype.value = function() { + return this._wrapped; + }; + +}).call(this); diff --git a/src/static/js/undomodule.js b/src/static/js/undomodule.js index 8b0c0909..4b55311b 100644 --- a/src/static/js/undomodule.js +++ b/src/static/js/undomodule.js @@ -21,7 +21,7 @@ */ var Changeset = require('./Changeset'); -var extend = require('./ace2_common').extend; +var _ = require('./underscore'); var undoModule = (function() { @@ -52,7 +52,7 @@ var undoModule = (function() function pushEvent(event) { - var e = extend( + var e = _.extend( {}, event); e.elementType = UNDOABLE_EVENT; stackElements.push(e); From af96509fbb84f2c05426ba2e5208dcd34edd4f90 Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Sat, 17 Mar 2012 18:17:10 +0100 Subject: [PATCH 097/297] Plugin install/uninstall --- src/node/hooks/express/adminplugins.js | 22 +++++++++++---- src/templates/admin/plugins.html | 38 +++++++++++++++++--------- 2 files changed, 41 insertions(+), 19 deletions(-) diff --git a/src/node/hooks/express/adminplugins.js b/src/node/hooks/express/adminplugins.js index d3884acb..4dbd788f 100644 --- a/src/node/hooks/express/adminplugins.js +++ b/src/node/hooks/express/adminplugins.js @@ -32,14 +32,24 @@ exports.socketio = function (hook_name, args, cb) { }); }); - socket.on("install", function (query) { + socket.on("install", function (plugin_name) { + socket.emit("progress", {progress:0, message:'Downloading and installing ' + plugin_name + "..."}); + installer.install(plugin_name, function (er) { + if (er) + socket.emit("progress", {progress:1, error:er}); + else + socket.emit("progress", {progress:1, message:'Done.'}); + }); }); - socket.on("uninstall", function (query) { + socket.on("uninstall", function (plugin_name) { + socket.emit("progress", {progress:0, message:'Uninstalling ' + plugin_name + "..."}); + installer.uninstall(plugin_name, function (er) { + if (er) + socket.emit("progress", {progress:1, error:er}); + else + socket.emit("progress", {progress:1, message:'Done.'}); + }); }); - - - - }); } diff --git a/src/templates/admin/plugins.html b/src/templates/admin/plugins.html index f8316857..61e277d2 100644 --- a/src/templates/admin/plugins.html +++ b/src/templates/admin/plugins.html @@ -54,14 +54,28 @@ $(document).ready(function () { var socket = io.connect().of("/pluginfw/installer"); - $("#progress.dialog .close").click(function () { - $("#progress.dialog").hide(); - }); + function updateHandlers() { + $("#progress.dialog .close").click(function () { + $("#progress.dialog").hide(); + }); - $("#do-search").click(function () { - if ($("#search-query")[0].value != "") - socket.emit("search", $("#search-query")[0].value); - }); + $("#do-search").click(function () { + if ($("#search-query")[0].value != "") + socket.emit("search", $("#search-query")[0].value); + }); + + $("#do-install").click(function (e) { + var row = $(e.target).closest("tr"); + socket.emit("install", row.find(".name").html()); + }); + + $("#do-uninstall").click(function (e) { + var row = $(e.target).closest("tr"); + socket.emit("install", row.find(".name").html()); + }); + } + + updateHandlers(); socket.on('progress', function (data) { $("#progress.dialog .close").hide(); @@ -93,6 +107,7 @@ } $("#search-results").append(row); } + updateHandlers(); }); }); @@ -120,13 +135,10 @@ <% for (var plugin_name in plugins) { %> <% var plugin = plugins[plugin_name]; %> - <%= plugin.package.name %> + <%= plugin.package.name %> <%= plugin.package.description %> -
- - -
+ <% } %> @@ -153,7 +165,7 @@ - + From 8eb43a3ebf7c1b7bd5474d8abff4223b995e911b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Bartelme=C3=9F?= Date: Sun, 18 Mar 2012 09:05:46 +0100 Subject: [PATCH 098/297] replaceing AttributePoolFactory by AttributePool --- bin/convert.js | 4 +- src/node/db/Pad.js | 4 +- src/node/easysync_tests.js | 20 +-- src/node/handler/PadMessageHandler.js | 4 +- src/node/handler/TimesliderMessageHandler.js | 4 +- src/node/utils/tar.json | 4 +- src/static/js/AttributePoolFactory.js | 124 +++++++++---------- src/static/js/Changeset.js | 4 +- src/static/js/ace2_inner.js | 3 +- src/static/js/broadcast.js | 2 +- src/static/js/changesettracker.js | 6 +- 11 files changed, 90 insertions(+), 89 deletions(-) diff --git a/bin/convert.js b/bin/convert.js index 24fd393a..ec792717 100644 --- a/bin/convert.js +++ b/bin/convert.js @@ -6,7 +6,7 @@ var mysql = require("mysql"); var async = require("async"); var Changeset = require("ep_etherpad-lite/static/js/Changeset"); var randomString = require('ep_etherpad-lite/static/js/pad_utils').randomString; -var AttributePoolFactory = require("ep_etherpad-lite/static/js/AttributePoolFactory"); +var AttributePool = require("ep_etherpad-lite/static/js/AttributePool"); var settingsFile = process.argv[2]; var sqlOutputFile = process.argv[3]; @@ -384,7 +384,7 @@ function convertPad(padId, callback) } //generate the latest atext - var fullAPool = AttributePoolFactory.createAttributePool().fromJsonable(apool); + var fullAPool = (new AttributePool()).fromJsonable(apool); var keyRev = Math.floor(padmeta.head / padmeta.keyRevInterval) * padmeta.keyRevInterval; var atext = changesetsMeta[keyRev].atext; var curRev = keyRev; diff --git a/src/node/db/Pad.js b/src/node/db/Pad.js index b69780a4..c384f172 100644 --- a/src/node/db/Pad.js +++ b/src/node/db/Pad.js @@ -5,7 +5,7 @@ var ERR = require("async-stacktrace"); var Changeset = require("ep_etherpad-lite/static/js/Changeset"); -var AttributePoolFactory = require("ep_etherpad-lite/static/js/AttributePoolFactory"); +var AttributePool = require("ep_etherpad-lite/static/js/AttributePool"); var randomString = require('ep_etherpad-lite/static/js/pad_utils').randomString; var db = require("./DB").db; var async = require("async"); @@ -28,7 +28,7 @@ exports.cleanText = function (txt) { var Pad = function Pad(id) { this.atext = Changeset.makeAText("\n"); - this.pool = AttributePoolFactory.createAttributePool(); + this.pool = new AttributePool(); this.head = -1; this.chatHead = -1; this.publicStatus = false; diff --git a/src/node/easysync_tests.js b/src/node/easysync_tests.js index 7a148289..374e949f 100644 --- a/src/node/easysync_tests.js +++ b/src/node/easysync_tests.js @@ -22,7 +22,7 @@ var Changeset = require("ep_etherpad-lite/static/js/Changeset"); -var AttributePoolFactory = require("ep_etherpad-lite/static/js/AttributePoolFactory"); +var AttributePool = require("ep_etherpad-lite/static/js/AttributePool"); function random() { this.nextInt = function (maxValue) { @@ -227,7 +227,7 @@ function runTests() { return attribs; // it's already an attrib pool } else { // assume it's an array of attrib strings to be split and added - var p = AttributePoolFactory.createAttributePool(); + var p = new AttributePool(); attribs.forEach(function (kv) { p.putAttrib(kv.split(',')); }); @@ -325,7 +325,7 @@ function runTests() { runMutateAttributionTest(4, ['foo,bar', 'line,1', 'line,2', 'line,3', 'line,4', 'line,5'], "Z:5>1|2=2+1$x", ["?*1|1+1", "?*2|1+1", "*3|1+1", "?*4|1+1", "?*5|1+1"], ["?*1|1+1", "?*2|1+1", "+1*3|1+1", "?*4|1+1", "?*5|1+1"]); var testPoolWithChars = (function () { - var p = AttributePoolFactory.createAttributePool(); + var p = new AttributePool(); p.putAttrib(['char', 'newline']); for (var i = 1; i < 36; i++) { p.putAttrib(['char', Changeset.numToString(i)]); @@ -560,7 +560,7 @@ function runTests() { var rand = new random(); print("> testCompose#" + randomSeed); - var p = AttributePoolFactory.createAttributePool(); + var p = new AttributePool(); var startText = randomMultiline(10, 20, rand) + '\n'; @@ -594,7 +594,7 @@ function runTests() { (function simpleComposeAttributesTest() { print("> simpleComposeAttributesTest"); - var p = AttributePoolFactory.createAttributePool(); + var p = new AttributePool(); p.putAttrib(['bold', '']); p.putAttrib(['bold', 'true']); var cs1 = Changeset.checkRep("Z:2>1*1+1*1=1$x"); @@ -604,7 +604,7 @@ function runTests() { })(); (function followAttributesTest() { - var p = AttributePoolFactory.createAttributePool(); + var p = new AttributePool(); p.putAttrib(['x', '']); p.putAttrib(['x', 'abc']); p.putAttrib(['x', 'def']); @@ -633,7 +633,7 @@ function runTests() { var rand = new random(); print("> testFollow#" + randomSeed); - var p = AttributePoolFactory.createAttributePool(); + var p = new AttributePool(); var startText = randomMultiline(10, 20, rand) + '\n'; @@ -682,8 +682,8 @@ function runTests() { (function testMoveOpsToNewPool() { print("> testMoveOpsToNewPool"); - var pool1 = AttributePoolFactory.createAttributePool(); - var pool2 = AttributePoolFactory.createAttributePool(); + var pool1 = new AttributePool(); + var pool2 = new AttributePool(); pool1.putAttrib(['baz', 'qux']); pool1.putAttrib(['foo', 'bar']); @@ -738,7 +738,7 @@ function runTests() { (function testOpAttributeValue() { print("> testOpAttributeValue"); - var p = AttributePoolFactory.createAttributePool(); + var p = new AttributePool(); p.putAttrib(['name', 'david']); p.putAttrib(['color', 'green']); diff --git a/src/node/handler/PadMessageHandler.js b/src/node/handler/PadMessageHandler.js index e26bb46e..b9ab6494 100644 --- a/src/node/handler/PadMessageHandler.js +++ b/src/node/handler/PadMessageHandler.js @@ -23,7 +23,7 @@ var ERR = require("async-stacktrace"); var async = require("async"); var padManager = require("../db/PadManager"); var Changeset = require("ep_etherpad-lite/static/js/Changeset"); -var AttributePoolFactory = require("ep_etherpad-lite/static/js/AttributePoolFactory"); +var AttributePool = require("ep_etherpad-lite/static/js/AttributePool"); var authorManager = require("../db/AuthorManager"); var readOnlyManager = require("../db/ReadOnlyManager"); var settings = require('../utils/Settings'); @@ -368,7 +368,7 @@ function handleUserChanges(client, message) //get all Vars we need var baseRev = message.data.baseRev; - var wireApool = (AttributePoolFactory.createAttributePool()).fromJsonable(message.data.apool); + var wireApool = (new AttributePool()).fromJsonable(message.data.apool); var changeset = message.data.changeset; var r, apool, pad; diff --git a/src/node/handler/TimesliderMessageHandler.js b/src/node/handler/TimesliderMessageHandler.js index 0081e645..da859779 100644 --- a/src/node/handler/TimesliderMessageHandler.js +++ b/src/node/handler/TimesliderMessageHandler.js @@ -23,7 +23,7 @@ var ERR = require("async-stacktrace"); var async = require("async"); var padManager = require("../db/PadManager"); var Changeset = require("ep_etherpad-lite/static/js/Changeset"); -var AttributePoolFactory = require("ep_etherpad-lite/static/js/AttributePoolFactory"); +var AttributePool = require("ep_etherpad-lite/static/js/AttributePool"); var settings = require('../utils/Settings'); var authorManager = require("../db/AuthorManager"); var log4js = require('log4js'); @@ -265,7 +265,7 @@ function getChangesetInfo(padId, startNum, endNum, granularity, callback) var forwardsChangesets = []; var backwardsChangesets = []; var timeDeltas = []; - var apool = AttributePoolFactory.createAttributePool(); + var apool = new AttributePool(); var pad; var composedChangesets = {}; var revisionDate = []; diff --git a/src/node/utils/tar.json b/src/node/utils/tar.json index a905eb44..3f6550e7 100644 --- a/src/node/utils/tar.json +++ b/src/node/utils/tar.json @@ -39,7 +39,7 @@ , "pad_modals.js" , "pad_savedrevs.js" , "pad_impexp.js" - , "AttributePoolFactory.js" + , "AttributePool.js" , "Changeset.js" , "domline.js" , "linestylefilter.js" @@ -51,7 +51,7 @@ ] , "ace2_inner.js": [ "ace2_common.js" - , "AttributePoolFactory.js" + , "AttributePool.js" , "Changeset.js" , "security.js" , "skiplist.js" diff --git a/src/static/js/AttributePoolFactory.js b/src/static/js/AttributePoolFactory.js index 00b58dbb..a9245daf 100644 --- a/src/static/js/AttributePoolFactory.js +++ b/src/static/js/AttributePoolFactory.js @@ -22,69 +22,69 @@ * limitations under the License. */ -exports.createAttributePool = function () { - var p = {}; - p.numToAttrib = {}; // e.g. {0: ['foo','bar']} - p.attribToNum = {}; // e.g. {'foo,bar': 0} - p.nextNum = 0; +var AttributePool = function () { + this.numToAttrib = {}; // e.g. {0: ['foo','bar']} + this.attribToNum = {}; // e.g. {'foo,bar': 0} + this.nextNum = 0; +}; - p.putAttrib = function (attrib, dontAddIfAbsent) { - var str = String(attrib); - if (str in p.attribToNum) { - return p.attribToNum[str]; - } - if (dontAddIfAbsent) { - return -1; - } - var num = p.nextNum++; - p.attribToNum[str] = num; - p.numToAttrib[num] = [String(attrib[0] || ''), String(attrib[1] || '')]; - return num; +AttributePool.prototype.putAttrib = function (attrib, dontAddIfAbsent) { + var str = String(attrib); + if (str in this.attribToNum) { + return this.attribToNum[str]; + } + if (dontAddIfAbsent) { + return -1; + } + var num = this.nextNum++; + this.attribToNum[str] = num; + this.numToAttrib[num] = [String(attrib[0] || ''), String(attrib[1] || '')]; + return num; +}; + +AttributePool.prototype.getAttrib = function (num) { + var pair = this.numToAttrib[num]; + if (!pair) { + return pair; + } + return [pair[0], pair[1]]; // return a mutable copy +}; + +AttributePool.prototype.getAttribKey = function (num) { + var pair = this.numToAttrib[num]; + if (!pair) return ''; + return pair[0]; +}; + +AttributePool.prototype.getAttribValue = function (num) { + var pair = this.numToAttrib[num]; + if (!pair) return ''; + return pair[1]; +}; + +AttributePool.prototype.eachAttrib = function (func) { + for (var n in this.numToAttrib) { + var pair = this.numToAttrib[n]; + func(pair[0], pair[1]); + } +}; + +AttributePool.prototype.toJsonable = function () { + return { + numToAttrib: this.numToAttrib, + nextNum: this.nextNum }; +}; - p.getAttrib = function (num) { - var pair = p.numToAttrib[num]; - if (!pair) { - return pair; - } - return [pair[0], pair[1]]; // return a mutable copy - }; +AttributePool.prototype.fromJsonable = function (obj) { + this.numToAttrib = obj.numToAttrib; + this.nextNum = obj.nextNum; + this.attribToNum = {}; + for (var n in this.numToAttrib) { + this.attribToNum[String(this.numToAttrib[n])] = Number(n); + } + return this; +}; + - p.getAttribKey = function (num) { - var pair = p.numToAttrib[num]; - if (!pair) return ''; - return pair[0]; - }; - - p.getAttribValue = function (num) { - var pair = p.numToAttrib[num]; - if (!pair) return ''; - return pair[1]; - }; - - p.eachAttrib = function (func) { - for (var n in p.numToAttrib) { - var pair = p.numToAttrib[n]; - func(pair[0], pair[1]); - } - }; - - p.toJsonable = function () { - return { - numToAttrib: p.numToAttrib, - nextNum: p.nextNum - }; - }; - - p.fromJsonable = function (obj) { - p.numToAttrib = obj.numToAttrib; - p.nextNum = obj.nextNum; - p.attribToNum = {}; - for (var n in p.numToAttrib) { - p.attribToNum[String(p.numToAttrib[n])] = Number(n); - } - return p; - }; - - return p; -} +module.exports = AttributePool; \ No newline at end of file diff --git a/src/static/js/Changeset.js b/src/static/js/Changeset.js index fd1900ba..738ee1ba 100644 --- a/src/static/js/Changeset.js +++ b/src/static/js/Changeset.js @@ -25,7 +25,7 @@ * limitations under the License. */ -var AttributePoolFactory = require("./AttributePoolFactory"); +var AttributePool = require("./AttributePool"); var _opt = null; @@ -1731,7 +1731,7 @@ exports.appendATextToAssembler = function (atext, assem) { * @param pool {AtributePool} */ exports.prepareForWire = function (cs, pool) { - var newPool = AttributePoolFactory.createAttributePool();; + var newPool = new AttributePool(); var newCs = exports.moveOpsToNewPool(cs, pool, newPool); return { translated: newCs, diff --git a/src/static/js/ace2_inner.js b/src/static/js/ace2_inner.js index 66f19faf..d278254f 100644 --- a/src/static/js/ace2_inner.js +++ b/src/static/js/ace2_inner.js @@ -43,7 +43,7 @@ var colorutils = require('./colorutils').colorutils; var makeContentCollector = require('./contentcollector').makeContentCollector; var makeCSSManager = require('./cssmanager').makeCSSManager; var domline = require('./domline').domline; -var AttribPool = require('./AttributePoolFactory').createAttributePool; +var AttribPool = require('./AttributePool'); var Changeset = require('./Changeset'); var linestylefilter = require('./linestylefilter').linestylefilter; var newSkipList = require('./skiplist').newSkipList; @@ -51,6 +51,7 @@ var undoModule = require('./undomodule').undoModule; var makeVirtualLineView = require('./virtual_lines').makeVirtualLineView; function Ace2Inner(){ + var DEBUG = false; //$$ build script replaces the string "var DEBUG=true;//$$" with "var DEBUG=false;" // changed to false var isSetUp = false; diff --git a/src/static/js/broadcast.js b/src/static/js/broadcast.js index 485db44f..333e3b65 100644 --- a/src/static/js/broadcast.js +++ b/src/static/js/broadcast.js @@ -22,7 +22,7 @@ var makeCSSManager = require('./cssmanager').makeCSSManager; var domline = require('./domline').domline; -var AttribPool = require('./AttributePoolFactory').createAttributePool; +var AttribPool = require('./AttributePool'); var Changeset = require('./Changeset'); var linestylefilter = require('./linestylefilter').linestylefilter; var colorutils = require('./colorutils').colorutils; diff --git a/src/static/js/changesettracker.js b/src/static/js/changesettracker.js index b0219852..58ef21cb 100644 --- a/src/static/js/changesettracker.js +++ b/src/static/js/changesettracker.js @@ -20,7 +20,7 @@ * limitations under the License. */ -var AttribPool = require('./AttributePoolFactory').createAttributePool; +var AttributePool = require('./AttributePool'); var Changeset = require('./Changeset'); function makeChangesetTracker(scheduler, apool, aceCallbacksProvider) @@ -83,7 +83,7 @@ function makeChangesetTracker(scheduler, apool, aceCallbacksProvider) baseAText = Changeset.cloneAText(atext); if (apoolJsonObj) { - var wireApool = (new AttribPool()).fromJsonable(apoolJsonObj); + var wireApool = (new AttributePool()).fromJsonable(apoolJsonObj); baseAText.attribs = Changeset.moveOpsToNewPool(baseAText.attribs, wireApool, apool); } submittedChangeset = null; @@ -117,7 +117,7 @@ function makeChangesetTracker(scheduler, apool, aceCallbacksProvider) if (apoolJsonObj) { - var wireApool = (new AttribPool()).fromJsonable(apoolJsonObj); + var wireApool = (new AttributePool()).fromJsonable(apoolJsonObj); c = Changeset.moveOpsToNewPool(c, wireApool, apool); } From 902837f29580996643c99e3b00e74605691cd659 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Bartelme=C3=9F?= Date: Sun, 18 Mar 2012 09:06:29 +0100 Subject: [PATCH 099/297] renaming AttributePoolFactory --- src/static/js/{AttributePoolFactory.js => AttributePool.js} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/static/js/{AttributePoolFactory.js => AttributePool.js} (100%) diff --git a/src/static/js/AttributePoolFactory.js b/src/static/js/AttributePool.js similarity index 100% rename from src/static/js/AttributePoolFactory.js rename to src/static/js/AttributePool.js From 38742401c97531d166ad5a02b4e45de913ec272f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Bartelme=C3=9F?= Date: Sun, 18 Mar 2012 11:34:56 +0100 Subject: [PATCH 100/297] newSkipList() -> new SkipList() --- src/static/js/ace2_inner.js | 4 ++-- src/static/js/skiplist.js | 36 +++++++----------------------------- 2 files changed, 9 insertions(+), 31 deletions(-) diff --git a/src/static/js/ace2_inner.js b/src/static/js/ace2_inner.js index d278254f..f30a0467 100644 --- a/src/static/js/ace2_inner.js +++ b/src/static/js/ace2_inner.js @@ -46,7 +46,7 @@ var domline = require('./domline').domline; var AttribPool = require('./AttributePool'); var Changeset = require('./Changeset'); var linestylefilter = require('./linestylefilter').linestylefilter; -var newSkipList = require('./skiplist').newSkipList; +var SkipList = require('./skiplist'); var undoModule = require('./undomodule').undoModule; var makeVirtualLineView = require('./virtual_lines').makeVirtualLineView; @@ -95,7 +95,7 @@ function Ace2Inner(){ // native IE selections have that behavior (which we try not to interfere with). // Must be false if selection is collapsed! var rep = { - lines: newSkipList(), + lines: new SkipList(), selStart: null, selEnd: null, selFocusAtStart: false, diff --git a/src/static/js/skiplist.js b/src/static/js/skiplist.js index 190bc55b..2132d8e3 100644 --- a/src/static/js/skiplist.js +++ b/src/static/js/skiplist.js @@ -20,11 +20,11 @@ * limitations under the License. */ +var Ace2Common = require('./ace2_common'); +var noop = Ace2Common.noop; +var extend = Ace2Common.extend; -var noop = require('./ace2_common').noop; - - -function newSkipList() +function SkipList() { var PROFILER = window.PROFILER; if (!PROFILER) @@ -284,27 +284,6 @@ function newSkipList() } return dist; } -/*function _debugToString() { - var array = [start]; - while (array[array.length-1] !== end) { - array[array.length] = array[array.length-1].downPtrs[0]; - } - function getIndex(node) { - if (!node) return null; - for(var i=0;i Date: Mon, 19 Mar 2012 16:59:57 +0100 Subject: [PATCH 101/297] Plugin list can now be reloaded 'live' --- src/static/js/pluginfw/read-installed.js | 324 +++++++++++++++++++++++ 1 file changed, 324 insertions(+) create mode 100644 src/static/js/pluginfw/read-installed.js diff --git a/src/static/js/pluginfw/read-installed.js b/src/static/js/pluginfw/read-installed.js new file mode 100644 index 00000000..cc03b357 --- /dev/null +++ b/src/static/js/pluginfw/read-installed.js @@ -0,0 +1,324 @@ +// A copy of npm/lib/utils/read-installed.js +// that is hacked to not cache everything :) + +// Walk through the file-system "database" of installed +// packages, and create a data object related to the +// installed versions of each package. + +/* +This will traverse through all node_modules folders, +resolving the dependencies object to the object corresponding to +the package that meets that dep, or just the version/range if +unmet. + +Assuming that you had this folder structure: + +/path/to ++-- package.json { name = "root" } +`-- node_modules + +-- foo {bar, baz, asdf} + | +-- node_modules + | +-- bar { baz } + | `-- baz + `-- asdf + +where "foo" depends on bar, baz, and asdf, bar depends on baz, +and bar and baz are bundled with foo, whereas "asdf" is at +the higher level (sibling to foo), you'd get this object structure: + +{ +, path: "/path/to" +, parent: null +, dependencies: + { foo : + { version: "1.2.3" + , path: "/path/to/node_modules/foo" + , parent: + , dependencies: + { bar: + { parent: + , path: "/path/to/node_modules/foo/node_modules/bar" + , version: "2.3.4" + , dependencies: { baz: } + } + , baz: { ... } + , asdf: + } + } + , asdf: { ... } + } +} + +Unmet deps are left as strings. +Extraneous deps are marked with extraneous:true +deps that don't meet a requirement are marked with invalid:true + +to READ(packagefolder, parentobj, name, reqver) +obj = read package.json +installed = ./node_modules/* +if parentobj is null, and no package.json + obj = {dependencies:{:"*"}} +deps = Object.keys(obj.dependencies) +obj.path = packagefolder +obj.parent = parentobj +if name, && obj.name !== name, obj.invalid = true +if reqver, && obj.version !satisfies reqver, obj.invalid = true +if !reqver && parentobj, obj.extraneous = true +for each folder in installed + obj.dependencies[folder] = READ(packagefolder+node_modules+folder, + obj, folder, obj.dependencies[folder]) +# walk tree to find unmet deps +for each dep in obj.dependencies not in installed + r = obj.parent + while r + if r.dependencies[dep] + if r.dependencies[dep].verion !satisfies obj.dependencies[dep] + WARN + r.dependencies[dep].invalid = true + obj.dependencies[dep] = r.dependencies[dep] + r = null + else r = r.parent +return obj + + +TODO: +1. Find unmet deps in parent directories, searching as node does up +as far as the left-most node_modules folder. +2. Ignore anything in node_modules that isn't a package folder. + +*/ + + +var npm = require("npm/lib/npm.js") + , fs = require("graceful-fs") + , path = require("path") + , asyncMap = require("slide").asyncMap + , semver = require("semver") + , readJson = require("npm/lib/utils/read-json.js") + , log = require("npm/lib/utils/log.js") + +module.exports = readInstalled + +function readInstalled (folder, cb) { + /* This is where we clear the cache, these three lines are all the + * new code there is */ + rpSeen = {}; + riSeen = []; + var fuSeen = []; + + var d = npm.config.get("depth") + readInstalled_(folder, null, null, null, 0, d, function (er, obj) { + if (er) return cb(er) + // now obj has all the installed things, where they're installed + // figure out the inheritance links, now that the object is built. + resolveInheritance(obj) + cb(null, obj) + }) +} + +var rpSeen = {} +function readInstalled_ (folder, parent, name, reqver, depth, maxDepth, cb) { + //console.error(folder, name) + + var installed + , obj + , real + , link + + fs.readdir(path.resolve(folder, "node_modules"), function (er, i) { + // error indicates that nothing is installed here + if (er) i = [] + installed = i.filter(function (f) { return f.charAt(0) !== "." }) + next() + }) + + readJson(path.resolve(folder, "package.json"), function (er, data) { + obj = copy(data) + + if (!parent) { + obj = obj || true + er = null + } + return next(er) + }) + + fs.lstat(folder, function (er, st) { + if (er) { + if (!parent) real = true + return next(er) + } + fs.realpath(folder, function (er, rp) { + //console.error("realpath(%j) = %j", folder, rp) + real = rp + if (st.isSymbolicLink()) link = rp + next(er) + }) + }) + + var errState = null + , called = false + function next (er) { + if (errState) return + if (er) { + errState = er + return cb(null, []) + } + //console.error('next', installed, obj && typeof obj, name, real) + if (!installed || !obj || !real || called) return + called = true + if (rpSeen[real]) return cb(null, rpSeen[real]) + if (obj === true) { + obj = {dependencies:{}, path:folder} + installed.forEach(function (i) { obj.dependencies[i] = "*" }) + } + if (name && obj.name !== name) obj.invalid = true + obj.realName = name || obj.name + obj.dependencies = obj.dependencies || {} + + // "foo":"http://blah" is always presumed valid + if (reqver + && semver.validRange(reqver) + && !semver.satisfies(obj.version, reqver)) { + obj.invalid = true + } + + if (parent + && !(name in parent.dependencies) + && !(name in (parent.devDependencies || {}))) { + obj.extraneous = true + } + obj.path = obj.path || folder + obj.realPath = real + obj.link = link + if (parent && !obj.link) obj.parent = parent + rpSeen[real] = obj + obj.depth = depth + if (depth >= maxDepth) return cb(null, obj) + asyncMap(installed, function (pkg, cb) { + var rv = obj.dependencies[pkg] + if (!rv && obj.devDependencies) rv = obj.devDependencies[pkg] + readInstalled_( path.resolve(folder, "node_modules/"+pkg) + , obj, pkg, obj.dependencies[pkg], depth + 1, maxDepth + , cb ) + }, function (er, installedData) { + if (er) return cb(er) + installedData.forEach(function (dep) { + obj.dependencies[dep.realName] = dep + }) + + // any strings here are unmet things. however, if it's + // optional, then that's fine, so just delete it. + if (obj.optionalDependencies) { + Object.keys(obj.optionalDependencies).forEach(function (dep) { + if (typeof obj.dependencies[dep] === "string") { + delete obj.dependencies[dep] + } + }) + } + return cb(null, obj) + }) + } +} + +// starting from a root object, call findUnmet on each layer of children +var riSeen = [] +function resolveInheritance (obj) { + if (typeof obj !== "object") return + if (riSeen.indexOf(obj) !== -1) return + riSeen.push(obj) + if (typeof obj.dependencies !== "object") { + obj.dependencies = {} + } + Object.keys(obj.dependencies).forEach(function (dep) { + findUnmet(obj.dependencies[dep]) + }) + Object.keys(obj.dependencies).forEach(function (dep) { + resolveInheritance(obj.dependencies[dep]) + }) +} + +// find unmet deps by walking up the tree object. +// No I/O +var fuSeen = [] +function findUnmet (obj) { + if (fuSeen.indexOf(obj) !== -1) return + fuSeen.push(obj) + //console.error("find unmet", obj.name, obj.parent && obj.parent.name) + var deps = obj.dependencies = obj.dependencies || {} + //console.error(deps) + Object.keys(deps) + .filter(function (d) { return typeof deps[d] === "string" }) + .forEach(function (d) { + //console.error("find unmet", obj.name, d, deps[d]) + var r = obj.parent + , found = null + while (r && !found && typeof deps[d] === "string") { + // if r is a valid choice, then use that. + found = r.dependencies[d] + if (!found && r.realName === d) found = r + + if (!found) { + r = r.link ? null : r.parent + continue + } + if ( typeof deps[d] === "string" + && !semver.satisfies(found.version, deps[d])) { + // the bad thing will happen + log.warn(obj.path + " requires "+d+"@'"+deps[d] + +"' but will load\n" + +found.path+",\nwhich is version "+found.version + ,"unmet dependency") + found.invalid = true + } + deps[d] = found + } + + }) + log.verbose([obj._id], "returning") + return obj +} + +function copy (obj) { + if (!obj || typeof obj !== 'object') return obj + if (Array.isArray(obj)) return obj.map(copy) + + var o = {} + for (var i in obj) o[i] = copy(obj[i]) + return o +} + +if (module === require.main) { + var util = require("util") + console.error("testing") + + var called = 0 + readInstalled(process.cwd(), function (er, map) { + console.error(called ++) + if (er) return console.error(er.stack || er.message) + cleanup(map) + console.error(util.inspect(map, true, 10, true)) + }) + + var seen = [] + function cleanup (map) { + if (seen.indexOf(map) !== -1) return + seen.push(map) + for (var i in map) switch (i) { + case "_id": + case "path": + case "extraneous": case "invalid": + case "dependencies": case "name": + continue + default: delete map[i] + } + var dep = map.dependencies +// delete map.dependencies + if (dep) { +// map.dependencies = dep + for (var i in dep) if (typeof dep[i] === "object") { + cleanup(dep[i]) + } + } + return map + } +} From c591efb352030d2e348b2fa63fba78e722c75a62 Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Mon, 19 Mar 2012 17:16:49 +0100 Subject: [PATCH 102/297] Plugin list can now be reloaded 'live' --- src/node/hooks/express/adminplugins.js | 30 ++++--- src/package.json | 8 +- src/static/js/pluginfw/hooks.js | 8 +- src/static/js/pluginfw/installer.js | 103 ++++++++++++++++--------- src/static/js/pluginfw/plugins.js | 14 +++- src/templates/admin/plugins.html | 72 ++++++++++++----- 6 files changed, 152 insertions(+), 83 deletions(-) diff --git a/src/node/hooks/express/adminplugins.js b/src/node/hooks/express/adminplugins.js index 4dbd788f..fa7e7077 100644 --- a/src/node/hooks/express/adminplugins.js +++ b/src/node/hooks/express/adminplugins.js @@ -1,6 +1,7 @@ var path = require('path'); var eejs = require('ep_etherpad-lite/node/eejs'); var installer = require('ep_etherpad-lite/static/js/pluginfw/installer'); +var plugins = require('ep_etherpad-lite/static/js/pluginfw/plugins'); exports.expressCreateServer = function (hook_name, args, cb) { args.app.get('/admin/plugins', function(req, res) { @@ -20,35 +21,30 @@ exports.expressCreateServer = function (hook_name, args, cb) { exports.socketio = function (hook_name, args, cb) { var io = args.io.of("/pluginfw/installer"); io.on('connection', function (socket) { + socket.on("load", function (query) { + socket.emit("installed-results", {results: plugins.plugins}); + }); + socket.on("search", function (query) { socket.emit("progress", {progress:0, message:'Fetching results...'}); - installer.search(query, function (er, data) { - if (er) { - socket.emit("progress", {progress:1, error:er}); - } else { - socket.emit("search-result", {results: data}); - socket.emit("progress", {progress:1, message:'Done.'}); - } + installer.search(query, function (progress) { + if (progress.results) + socket.emit("search-result", progress); + socket.emit("progress", progress); }); }); socket.on("install", function (plugin_name) { socket.emit("progress", {progress:0, message:'Downloading and installing ' + plugin_name + "..."}); - installer.install(plugin_name, function (er) { - if (er) - socket.emit("progress", {progress:1, error:er}); - else - socket.emit("progress", {progress:1, message:'Done.'}); + installer.install(plugin_name, function (progress) { + socket.emit("progress", progress); }); }); socket.on("uninstall", function (plugin_name) { socket.emit("progress", {progress:0, message:'Uninstalling ' + plugin_name + "..."}); - installer.uninstall(plugin_name, function (er) { - if (er) - socket.emit("progress", {progress:1, error:er}); - else - socket.emit("progress", {progress:1, message:'Done.'}); + installer.uninstall(plugin_name, function (progress) { + socket.emit("progress", progress); }); }); }); diff --git a/src/package.json b/src/package.json index 80378a0a..34a9c01c 100644 --- a/src/package.json +++ b/src/package.json @@ -23,8 +23,14 @@ "log4js" : "0.4.1", "jsdom-nocontextifiy" : "0.2.10", "async-stacktrace" : "0.0.2", + "npm" : "1.1", - "ejs" : "0.6.1" + "ejs" : "0.6.1", + "node.extend" : "1.0.0", + "graceful-fs" : "1.1.5", + "slide" : "1.1.3", + "semver" : "1.0.13" + }, "devDependencies": { "jshint" : "*" diff --git a/src/static/js/pluginfw/hooks.js b/src/static/js/pluginfw/hooks.js index 1b09a6e5..0b96c882 100644 --- a/src/static/js/pluginfw/hooks.js +++ b/src/static/js/pluginfw/hooks.js @@ -40,14 +40,14 @@ exports.callAll = function (hook_name, args) { } exports.aCallAll = function (hook_name, args, cb) { - if (plugins.hooks[hook_name] === undefined) cb([]); + if (plugins.hooks[hook_name] === undefined) return cb(null, []); async.map( plugins.hooks[hook_name], function (hook, cb) { hookCallWrapper(hook, hook_name, args, function (res) { cb(null, res); }); }, function (err, res) { - cb(exports.flatten(res)); + cb(null, exports.flatten(res)); } ); } @@ -58,8 +58,8 @@ exports.callFirst = function (hook_name, args) { } exports.aCallFirst = function (hook_name, args, cb) { - if (plugins.hooks[hook_name][0] === undefined) cb([]); - hookCallWrapper(plugins.hooks[hook_name][0], hook_name, args, function (res) { cb(exports.flatten(res)); }); + if (plugins.hooks[hook_name][0] === undefined) return cb(null, []); + hookCallWrapper(plugins.hooks[hook_name][0], hook_name, args, function (res) { cb(null, exports.flatten(res)); }); } exports.callAllStr = function(hook_name, args, sep, pre, post) { diff --git a/src/static/js/pluginfw/installer.js b/src/static/js/pluginfw/installer.js index 3ba7f458..6cc043b7 100644 --- a/src/static/js/pluginfw/installer.js +++ b/src/static/js/pluginfw/installer.js @@ -3,43 +3,74 @@ var hooks = require("ep_etherpad-lite/static/js/pluginfw/hooks"); var npm = require("npm"); var registry = require("npm/lib/utils/npm-registry-client/index.js"); -exports.uninstall = function(plugin_name, cb) { +var withNpm = function (npmfn, cb) { npm.load({}, function (er) { - if (er) return cb(er) - npm.commands.uninstall([plugin_name], function (er) { - if (er) return cb(er); - hooks.aCallAll("pluginUninstall", {plugin_name: plugin_name}, function (er) { - cb(er); - }); - }) - }) -} - -exports.install = function(plugin_name, cb) { - npm.load({}, function (er) { - if (er) return cb(er) - npm.commands.install([plugin_name], function (er) { - if (er) return cb(er); - hooks.aCallAll("pluginInstall", {plugin_name: plugin_name}, function (er) { - cb(er); - }); + if (er) return cb({progress:1, error:er}); + npm.on("log", function (message) { + cb({progress: 0.5, message:message.msg + ": " + message.pref}); + }); + npmfn(function (er, data) { + if (er) return cb({progress:1, error:er.code + ": " + er.path}); + if (!data) data = {}; + data.progress = 1; + data.message = "Done."; + cb(data); }); - }) -} - -exports.search = function(pattern, cb) { - npm.load({}, function (er) { - registry.get( - "/-/all", null, 600, false, true, - function (er, data) { - if (er) return cb(er); - var res = {}; - for (key in data) { - if (/*key.indexOf(plugins.prefix) == 0 &&*/ key.indexOf(pattern) != -1) - res[key] = data[key]; - } - cb(null, res); - } - ); }); } + +// All these functions call their callback multiple times with +// {progress:[0,1], message:STRING, error:object}. They will call it +// with progress = 1 at least once, and at all times will either +// message or error be present, not both. It can be called multiple +// times for all values of propgress except for 1. + +exports.uninstall = function(plugin_name, cb) { + withNpm( + function (cb) { + npm.commands.uninstall([plugin_name], function (er) { + if (er) return cb(er); + hooks.aCallAll("pluginUninstall", {plugin_name: plugin_name}, function (er, data) { + if (er) return cb(er); + plugins.update(cb); + }); + }); + }, + cb + ); +}; + +exports.install = function(plugin_name, cb) { + withNpm( + function (cb) { + npm.commands.install([plugin_name], function (er) { + if (er) return cb(er); + hooks.aCallAll("pluginInstall", {plugin_name: plugin_name}, function (er, data) { + if (er) return cb(er); + plugins.update(cb); + }); + }); + }, + cb + ); +}; + +exports.search = function(pattern, cb) { + withNpm( + function (cb) { + registry.get( + "/-/all", null, 600, false, true, + function (er, data) { + if (er) return cb(er); + var res = {}; + for (key in data) { + if (/*key.indexOf(plugins.prefix) == 0 &&*/ key.indexOf(pattern) != -1) + res[key] = data[key]; + } + cb(null, {results:res}); + } + ); + }, + cb + ); +}; diff --git a/src/static/js/pluginfw/plugins.js b/src/static/js/pluginfw/plugins.js index c5c21903..5017962b 100644 --- a/src/static/js/pluginfw/plugins.js +++ b/src/static/js/pluginfw/plugins.js @@ -2,7 +2,7 @@ exports.isClient = typeof global != "object"; if (!exports.isClient) { var npm = require("npm/lib/npm.js"); - var readInstalled = require("npm/lib/utils/read-installed.js"); + var readInstalled = require("./read-installed.js"); var relativize = require("npm/lib/utils/relativize.js"); var readJson = require("npm/lib/utils/read-json.js"); var path = require("path"); @@ -10,6 +10,7 @@ if (!exports.isClient) { var fs = require("fs"); var tsort = require("./tsort"); var util = require("util"); + var extend = require("node.extend"); } exports.prefix = 'ep_'; @@ -112,14 +113,19 @@ exports.getPackages = function (cb) { function flatten(deps) { Object.keys(deps).forEach(function (name) { if (name.indexOf(exports.prefix) == 0) { - packages[name] = deps[name]; + packages[name] = extend({}, deps[name]); + // Delete anything that creates loops so that the plugin + // list can be sent as JSON to the web client + delete packages[name].dependencies; + delete packages[name].parent; } if (deps[name].dependencies !== undefined) flatten(deps[name].dependencies); - delete deps[name].dependencies; }); } - flatten([data]); + var tmp = {}; + tmp[data.name] = data; + flatten(tmp); cb(null, packages); }); } diff --git a/src/templates/admin/plugins.html b/src/templates/admin/plugins.html index 61e277d2..a0822e87 100644 --- a/src/templates/admin/plugins.html +++ b/src/templates/admin/plugins.html @@ -20,10 +20,10 @@ position: absolute; left: 50%; top: 50%; - width: 500px; - height: 400px; - margin-left: -250px; - margin-top: -200px; + width: 700px; + height: 500px; + margin-left: -350px; + margin-top: -250px; border: 3px solid #999999; background: #eeeeee; } @@ -33,6 +33,8 @@ border-bottom: 3px solid #999999; font-size: 24px; line-height: 24px; + height: 24px; + overflow: hidden; } .dialog .title .close { float: right; @@ -46,6 +48,7 @@ left: 10px; right: 10px; padding: 2px; + overflow: auto; } @@ -54,6 +57,8 @@ $(document).ready(function () { var socket = io.connect().of("/pluginfw/installer"); + var doUpdate = false; + function updateHandlers() { $("#progress.dialog .close").click(function () { $("#progress.dialog").hide(); @@ -64,14 +69,16 @@ socket.emit("search", $("#search-query")[0].value); }); - $("#do-install").click(function (e) { + $(".do-install").click(function (e) { var row = $(e.target).closest("tr"); + doUpdate = true; socket.emit("install", row.find(".name").html()); }); - $("#do-uninstall").click(function (e) { + $(".do-uninstall").click(function (e) { var row = $(e.target).closest("tr"); - socket.emit("install", row.find(".name").html()); + doUpdate = true; + socket.emit("uninstall", row.find(".name").html()); }); } @@ -80,17 +87,24 @@ socket.on('progress', function (data) { $("#progress.dialog .close").hide(); $("#progress.dialog").show(); - var message = data.message; + var message = "Unknown status"; + if (data.message) { + message = "" + data.message.toString() + ""; + } if (data.error) { - message = "
" + data.error.toString() + "
"; + message = "" + data.error.toString() + ""; } $("#progress.dialog .message").html(message); - $("#progress.dialog .history").append(message); + $("#progress.dialog .history").append("
" + message + "
"); if (data.progress >= 1) { if (data.error) { $("#progress.dialog .close").show(); } else { + if (doUpdate) { + doUpdate = false; + socket.emit("load"); + } $("#progress.dialog").hide(); } } @@ -109,6 +123,23 @@ } updateHandlers(); }); + + socket.on('installed-results', function (data) { + $("#installed-plugins *").remove(); + for (plugin_name in data.results) { + var plugin = data.results[plugin_name]; + var row = $("#installed-plugin-template").clone(); + + for (attr in plugin.package) { + row.find("." + attr).html(plugin.package[attr]); + } + $("#installed-plugins").append(row); + } + updateHandlers(); + }); + + socket.emit("load"); + }); @@ -131,17 +162,16 @@ - - <% for (var plugin_name in plugins) { %> - <% var plugin = plugins[plugin_name]; %> - - <%= plugin.package.name %> - <%= plugin.package.description %> - - - - - <% } %> + + + + + + + + + + From 37c0d279c1345a87413054ddb07838635110eb93 Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Wed, 21 Mar 2012 19:27:06 +0100 Subject: [PATCH 103/297] Bugfix for when a block hook calls eejs.require recursively --- src/node/eejs/index.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/node/eejs/index.js b/src/node/eejs/index.js index a16ddc80..828ab103 100644 --- a/src/node/eejs/index.js +++ b/src/node/eejs/index.js @@ -38,7 +38,7 @@ exports._init = function (b, recursive) { exports._exit = function (b, recursive) { exports.info.file_stack[exports.info.file_stack.length-1].inherit.forEach(function (item) { - exports.require(item.name, item.args); + exports._require(item.name, item.args); }); exports.info.buf = exports.info.buf_stack.pop(); } @@ -93,8 +93,6 @@ exports.inherit = function (name, args) { exports.require = function (name, args) { if (args == undefined) args = {}; - if (!exports.info) - exports.init(null); if ((name.indexOf("./") == 0 || name.indexOf("../") == 0) && exports.info.file_stack.length) { name = path.join(path.dirname(exports.info.file_stack[exports.info.file_stack.length-1].path), name); @@ -108,7 +106,9 @@ exports.require = function (name, args) { var res = ejs.render(template, args); exports.info.file_stack.pop(); - if (exports.info.buf) - exports.info.buf.push(res); return res; } + +exports._require = function (name, args) { + exports.info.buf.push(exports.require(name, args)); +} From 7304a9ef3f4650437602ce1b03dccd5ced3b9935 Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Wed, 21 Mar 2012 19:27:43 +0100 Subject: [PATCH 104/297] Bugfix for misplaced hook call --- src/static/js/ace.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/static/js/ace.js b/src/static/js/ace.js index 1306dba0..473ecc1b 100644 --- a/src/static/js/ace.js +++ b/src/static/js/ace.js @@ -233,13 +233,14 @@ require.setGlobalKeyPath("require");\n\ iframeHTML.push(doctype); iframeHTML.push(""); + hooks.callAll("aceInitInnerdocbodyHead", { + iframeHTML: iframeHTML + }); + // For compatability's sake transform in and out. for (var i = 0, ii = iframeHTML.length; i < ii; i++) { iframeHTML[i] = JSON.stringify(iframeHTML[i]); } - hooks.callAll("aceInitInnerdocbodyHead", { - iframeHTML: iframeHTML - }); for (var i = 0, ii = iframeHTML.length; i < ii; i++) { iframeHTML[i] = JSON.parse(iframeHTML[i]); } From 1ca12b24e658d27614f7b64dd8cb0e10fac2358a Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Wed, 21 Mar 2012 19:28:39 +0100 Subject: [PATCH 105/297] Bugfixes for plugin installer --- src/static/js/pluginfw/installer.js | 2 +- src/templates/admin/plugins.html | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/static/js/pluginfw/installer.js b/src/static/js/pluginfw/installer.js index 6cc043b7..127a95aa 100644 --- a/src/static/js/pluginfw/installer.js +++ b/src/static/js/pluginfw/installer.js @@ -64,7 +64,7 @@ exports.search = function(pattern, cb) { if (er) return cb(er); var res = {}; for (key in data) { - if (/*key.indexOf(plugins.prefix) == 0 &&*/ key.indexOf(pattern) != -1) + if (key.indexOf(plugins.prefix) == 0 && key.indexOf(pattern) != -1) res[key] = data[key]; } cb(null, {results:res}); diff --git a/src/templates/admin/plugins.html b/src/templates/admin/plugins.html index a0822e87..7dcb6fa3 100644 --- a/src/templates/admin/plugins.html +++ b/src/templates/admin/plugins.html @@ -60,22 +60,22 @@ var doUpdate = false; function updateHandlers() { - $("#progress.dialog .close").click(function () { + $("#progress.dialog .close").unbind('click').click(function () { $("#progress.dialog").hide(); }); - $("#do-search").click(function () { + $("#do-search").unbind('click').click(function () { if ($("#search-query")[0].value != "") socket.emit("search", $("#search-query")[0].value); }); - $(".do-install").click(function (e) { + $(".do-install").unbind('click').click(function (e) { var row = $(e.target).closest("tr"); doUpdate = true; socket.emit("install", row.find(".name").html()); }); - $(".do-uninstall").click(function (e) { + $(".do-uninstall").unbind('click').click(function (e) { var row = $(e.target).closest("tr"); doUpdate = true; socket.emit("uninstall", row.find(".name").html()); From 50474dff1f1fd9c6a573c723a928f297651a5975 Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Wed, 21 Mar 2012 19:29:06 +0100 Subject: [PATCH 106/297] Some new blocks to allow plugins to add scripts, styles and modals --- src/templates/pad.html | 138 +++++++++++++++++++++-------------------- 1 file changed, 71 insertions(+), 67 deletions(-) diff --git a/src/templates/pad.html b/src/templates/pad.html index e34f572b..42bf483b 100644 --- a/src/templates/pad.html +++ b/src/templates/pad.html @@ -7,9 +7,11 @@ - - - + <% e.begin_block("styles"); %> + + + + <% e.end_block(); %> @@ -215,74 +217,76 @@
-
-
-
Connecting...
-
Reestablishing connection...
-
-

Disconnected.

-

Opened in another window.

-

No Authorization.

-
-

We're having trouble talking to the EtherPad lite synchronization server. You may be connecting through an incompatible firewall or proxy server.

-
-
-

We were unable to connect to the EtherPad lite synchronization server. This may be due to an incompatibility with your web browser or internet connection.

-
-
-

You seem to have opened this pad in another browser window. If you'd like to use this window instead, you can reconnect.

-
-
-

Lost connection with the EtherPad lite synchronization server. This may be due to a loss of network connectivity.

-
-
-

Server not responding. This may be due to network connectivity issues or high load on the server.

-
-
-

Your browser's credentials or permissions have changed while viewing this pad. Try reconnecting.

-
-
-

This pad was deleted.

-
-
-

If this continues to happen, please let us know

-
-
- + <% e.begin_block("modals"); %> +
+
+
Connecting...
+
Reestablishing connection...
+
+

Disconnected.

+

Opened in another window.

+

No Authorization.

+
+

We're having trouble talking to the EtherPad lite synchronization server. You may be connecting through an incompatible firewall or proxy server.

+
+
+

We were unable to connect to the EtherPad lite synchronization server. This may be due to an incompatibility with your web browser or internet connection.

+
+
+

You seem to have opened this pad in another browser window. If you'd like to use this window instead, you can reconnect.

+
+
+

Lost connection with the EtherPad lite synchronization server. This may be due to a loss of network connectivity.

+
+
+

Server not responding. This may be due to network connectivity issues or high load on the server.

+
+
+

Your browser's credentials or permissions have changed while viewing this pad. Try reconnecting.

+
+
+

This pad was deleted.

+
+
+

If this continues to happen, please let us know

+
+
+ +
+
- -
- + <% e.end_block(); %>
+ + <% e.begin_block("scripts"); %> + + + + + - - - - - + /* TODO: These globals shouldn't exist. */ + pad = require('ep_etherpad-lite/static/js/pad').pad; + chat = require('ep_etherpad-lite/static/js/chat').chat; + padeditbar = require('ep_etherpad-lite/static/js/pad_editbar').padeditbar; + padimpexp = require('ep_etherpad-lite/static/js/pad_impexp').padimpexp; + }()); + + <% e.end_block(); %> From d21cc1912ccc3d63ee234aa893f6357e50e098f2 Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Wed, 21 Mar 2012 19:29:59 +0100 Subject: [PATCH 107/297] Better error message for broken JSON --- src/static/js/json2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/static/js/json2.js b/src/static/js/json2.js index 663f932c..d72b4be9 100644 --- a/src/static/js/json2.js +++ b/src/static/js/json2.js @@ -465,7 +465,7 @@ if (!JSON) } // If the text is not JSON parseable, then a SyntaxError is thrown. - throw new SyntaxError('JSON.parse'); + throw new SyntaxError('JSON.parse: ' + text); }; } }()); From 5261ba5a69c2df7e927c910451360d703bbe70d0 Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Thu, 22 Mar 2012 18:34:08 +0100 Subject: [PATCH 108/297] Forward-ported some bugfixes from olad etherpad --- src/static/js/ace2_inner.js | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/static/js/ace2_inner.js b/src/static/js/ace2_inner.js index 66f19faf..65a398b5 100644 --- a/src/static/js/ace2_inner.js +++ b/src/static/js/ace2_inner.js @@ -846,7 +846,7 @@ function Ace2Inner(){ var cmdArgs = Array.prototype.slice.call(arguments, 1); if (CMDS[cmd]) { - inCallStack(cmd, function() + inCallStackIfNecessary(cmd, function() { fastIncorp(9); CMDS[cmd].apply(CMDS, cmdArgs); @@ -856,7 +856,7 @@ function Ace2Inner(){ function replaceRange(start, end, text) { - inCallStack('replaceRange', function() + inCallStackIfNecessary('replaceRange', function() { fastIncorp(9); performDocumentReplaceRange(start, end, text); @@ -1159,7 +1159,7 @@ function Ace2Inner(){ return; } - inCallStack("idleWorkTimer", function() + inCallStackIfNecessary("idleWorkTimer", function() { var isTimeUp = newTimeLimit(250); @@ -2335,6 +2335,7 @@ function Ace2Inner(){ var cs = builder.toString(); performDocumentApplyChangeset(cs); } + editorInfo.ace_performDocumentApplyAttributesToRange = performDocumentApplyAttributesToRange; function buildKeepToStartOfRange(builder, start) { @@ -2860,6 +2861,7 @@ function Ace2Inner(){ currentCallStack.selectionAffected = true; } } + editorInfo.ace_performSelectionChange = performSelectionChange; // Change the abstract representation of the document to have a different selection. // Should not rely on the line representation. Should not affect the DOM. @@ -3287,7 +3289,7 @@ function Ace2Inner(){ function handleClick(evt) { - inCallStack("handleClick", function() + inCallStackIfNecessary("handleClick", function() { idleWorkTimer.atMost(200); }); @@ -3609,7 +3611,7 @@ function Ace2Inner(){ var stopped = false; - inCallStack("handleKeyEvent", function() + inCallStackIfNecessary("handleKeyEvent", function() { if (type == "keypress" || (isTypeForSpecialKey && keyCode == 13 /*return*/ )) @@ -4698,7 +4700,7 @@ function Ace2Inner(){ } // click below the body - inCallStack("handleOuterClick", function() + inCallStackIfNecessary("handleOuterClick", function() { // put caret at bottom of doc fastIncorp(11); @@ -4771,7 +4773,7 @@ function Ace2Inner(){ function setup() { doc = document; // defined as a var in scope outside - inCallStack("setup", function() + inCallStackIfNecessary("setup", function() { var body = doc.getElementById("innerdocbody"); root = body; // defined as a var in scope outside From b8a4333d1bf699725ae5df578a90417e045cd168 Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Thu, 22 Mar 2012 18:34:38 +0100 Subject: [PATCH 109/297] Exposed require to ejs pages! --- src/node/eejs/index.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/node/eejs/index.js b/src/node/eejs/index.js index 828ab103..90c69e59 100644 --- a/src/node/eejs/index.js +++ b/src/node/eejs/index.js @@ -100,6 +100,7 @@ exports.require = function (name, args) { var ejspath = require.resolve(name) args.e = exports; + args.require = require; var template = '<% e._init(buf); %>' + fs.readFileSync(ejspath).toString() + '<% e._exit(); %>'; exports.info.file_stack.push({path: ejspath, inherit: []}); From 22eaa6ffc012e83438d54e6fb5b023a7952246a7 Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Thu, 22 Mar 2012 18:35:06 +0100 Subject: [PATCH 110/297] Made it possible to disable minification again --- src/templates/pad.html | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/src/templates/pad.html b/src/templates/pad.html index 42bf483b..901fd433 100644 --- a/src/templates/pad.html +++ b/src/templates/pad.html @@ -1,3 +1,6 @@ +<% + var settings = require("ep_etherpad-lite/node/utils/Settings"); +%> @@ -268,13 +271,20 @@ - + <% if (settings.minify) { %> + + <% } %> '); hooks.callAll("aceInitInnerdocbodyHead", { iframeHTML: iframeHTML From b74447aa3cc550eb2e20034b1a56ea47c20c7b09 Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Wed, 28 Mar 2012 19:20:07 +0200 Subject: [PATCH 130/297] Styling generalization - use classes instead of id:s where applicable --- src/static/css/pad.css | 52 ++++++++++++++++++++++-------------------- src/templates/pad.html | 6 ++--- 2 files changed, 30 insertions(+), 28 deletions(-) diff --git a/src/static/css/pad.css b/src/static/css/pad.css index 969d0027..13f4bc93 100644 --- a/src/static/css/pad.css +++ b/src/static/css/pad.css @@ -24,7 +24,7 @@ a img } /* menu */ -#editbar ul +.toolbar ul { position: relative; list-style: none; @@ -35,18 +35,20 @@ a img } -#editbar +.toolbar { background: #f7f7f7; background: linear-gradient(#f7f7f7, #f1f1f1 80%); border-bottom: 1px solid #ccc; - height: 32px; overflow: hidden; padding-top: 3px; - width: 100%; + position: absolute; + left: 0; + right: 0; + height: 32px; } -#editbar ul li +.toolbar ul li { background: #fff; background: linear-gradient(#fff, #f0f0f0); @@ -61,52 +63,52 @@ a img width: 18px; } -#editbar ul li a +.toolbar ul li a { text-decoration: none; color: #ccc; position: absolute; } -#editbar ul li a span +.toolbar ul li a span { position: relative; top:-2px } -#editbar ul li:hover { +.toolbar ul li:hover { background: #fff; background: linear-gradient(#f4f4f4, #e4e4e4); } -#editbar ul li:active { +.toolbar ul li:active { background: #eee; background: linear-gradient(#ddd, #fff); box-shadow: 0 0 8px rgba(0,0,0,.1) inset; } -#editbar ul li.separator +.toolbar ul li.separator { border: inherit; background: inherit; visibility:hidden; width: 0px; } -#editbar ul li a +.toolbar ul li a { display: block; } -#editbar ul li a img +.toolbar ul li a img { padding: 1px; } -#editbar ul +.toolbar ul { float: left; } -#editbar ul#menu_right +.toolbar ul.menu_right { float: right; } @@ -320,7 +322,7 @@ a#hidetopmsg { position: absolute; right: 5px; bottom: 5px; } z-index: 10; } -#editbarsavetable +.toolbarsavetable { position:absolute; top: 6px; @@ -328,7 +330,7 @@ a#hidetopmsg { position: absolute; right: 5px; bottom: 5px; } height: 24px; } -#editbarsavetable td, #editbartable td +.toolbarsavetable td, .toolbartable td { white-space: nowrap; } @@ -688,14 +690,14 @@ a#topbarmaximize { background: url(static/img/maximize_maximized.png); } -#editbarinner h1 { +.toolbarinner h1 { line-height: 29px; font-size: 16px; padding-left: 6pt; margin-top: 0; } -#editbarinner h1 a { +.toolbarinner h1 a { font-size: 12px; } @@ -1173,13 +1175,13 @@ input[type=checkbox] { } @media screen and (max-width: 600px) { - #editbar ul li { + .toolbar ul li { padding: 4px 1px; } } @media only screen and (min-device-width: 320px) and (max-device-width: 720px) { - #editbar ul li { + .toolbar ul li { padding: 4px 3px; } #users { @@ -1194,7 +1196,7 @@ input[type=checkbox] { #editorcontainer { margin-bottom: 33px; } - #editbar ul#menu_right { + .toolbar ul.menu_right { background: #f7f7f7; background: linear-gradient(#f7f7f7, #f1f1f1 80%); width: 100%; @@ -1204,7 +1206,7 @@ input[type=checkbox] { bottom: 0; border-top: 1px solid #ccc; } - #editbar ul#menu_right li:last-child { + .toolbar ul.menu_right li:last-child { height: 24px; border-radius: 0; margin-top: 0; @@ -1226,7 +1228,7 @@ input[type=checkbox] { border-top-right-radius: 0; border-right: none; } - #editbar ul li a span { + .toolbar ul li a span { top: -3px; } #usericonback { @@ -1235,10 +1237,10 @@ input[type=checkbox] { #qrcode { display: none; } - #editbar ul#menu_right li:not(:last-child) { + .toolbar ul.menu_right li:not(:last-child) { display: block; } - #editbar ul#menu_right > li { + .toolbar ul.menu_right > li { background: none; border: none; margin-top: 4px; diff --git a/src/templates/pad.html b/src/templates/pad.html index 901fd433..765eec0c 100644 --- a/src/templates/pad.html +++ b/src/templates/pad.html @@ -18,8 +18,8 @@ -
- +
    <% e.begin_block("editbarMenuRight"); %>
  • @@ -95,17 +95,17 @@ -
+
-
+
-
+
@@ -150,20 +150,20 @@

Import from text file, HTML, PDF, Word, ODT or RTF


-
- -
-
+
+ +
+
-
Successful!
-
- - - - - - -
+
Successful!
+
+ + + + + + +
@@ -223,7 +223,7 @@
- +
<% e.begin_block("modals"); %>
@@ -271,7 +271,7 @@
<% e.end_block(); %>
- + <% e.begin_block("scripts"); %> From 3e4730058785209e0ca863b37dddcbbf9f2ce103 Mon Sep 17 00:00:00 2001 From: 0ip Date: Mon, 16 Apr 2012 15:19:53 +0200 Subject: [PATCH 197/297] template/pad.html removed id duplicates, moved revision button, converted TABS to spaces --- src/templates/pad.html | 252 ++++++++++++++++++++--------------------- 1 file changed, 125 insertions(+), 127 deletions(-) diff --git a/src/templates/pad.html b/src/templates/pad.html index 08e34fa2..6181b062 100644 --- a/src/templates/pad.html +++ b/src/templates/pad.html @@ -11,79 +11,77 @@ <% e.begin_block("styles"); %> - - - + + + <% e.end_block(); %>
    - <% e.begin_block("editbarMenuLeft"); %> -
  • - -
    • -
  • - -
    • -
  • - -
    • -
  • - -
    • -
  • -
  • - -
    • -
  • - -
    • -
  • - -
    • -
  • - -
    • -
  • -
  • - -
    • -
  • - -
    • -
  • -
  • - -
    • - <% e.end_block(); %> + <% e.begin_block("editbarMenuLeft"); %> +
  • + +
    • +
  • + +
    • +
  • + +
    • +
  • + +
    • +
  • +
  • + +
    • +
  • + +
    • +
  • + +
    • +
  • + +
    • +
  • +
  • + +
    • +
  • + +
    • +
  • +
  • + +
    • + <% e.end_block(); %>
    - <% e.begin_block("editbarMenuRight"); %> -
  • - -
    -     -
    • - - - -
  • - -
  • - - 1 -
    • - <% e.end_block(); %> + <% e.begin_block("editbarMenuRight"); %> + + + + +
  • + +
  • + + 1 +
    • + <% e.end_block(); %>
@@ -226,76 +224,76 @@
<% e.begin_block("modals"); %> -
-
-
Connecting...
-
Reestablishing connection...
-
-

Disconnected.

-

Opened in another window.

-

No Authorization.

-
-

We're having trouble talking to the EtherPad lite synchronization server. You may be connecting through an incompatible firewall or proxy server.

-
-
-

We were unable to connect to the EtherPad lite synchronization server. This may be due to an incompatibility with your web browser or internet connection.

-
-
-

You seem to have opened this pad in another browser window. If you'd like to use this window instead, you can reconnect.

-
-
-

Lost connection with the EtherPad lite synchronization server. This may be due to a loss of network connectivity.

-
-
-

Server not responding. This may be due to network connectivity issues or high load on the server.

-
-
-

Your browser's credentials or permissions have changed while viewing this pad. Try reconnecting.

-
-
-

This pad was deleted.

-
-
-

If this continues to happen, please let us know

-
-
- -
+
+
+
Connecting...
+
Reestablishing connection...
+
+

Disconnected.

+

Opened in another window.

+

No Authorization.

+
+

We're having trouble talking to the EtherPad lite synchronization server. You may be connecting through an incompatible firewall or proxy server.

+
+
+

We were unable to connect to the EtherPad lite synchronization server. This may be due to an incompatibility with your web browser or internet connection.

+
+
+

You seem to have opened this pad in another browser window. If you'd like to use this window instead, you can reconnect.

+
+
+

Lost connection with the EtherPad lite synchronization server. This may be due to a loss of network connectivity.

+
+
+

Server not responding. This may be due to network connectivity issues or high load on the server.

+
+
+

Your browser's credentials or permissions have changed while viewing this pad. Try reconnecting.

+
+
+

This pad was deleted.

+
+
+

If this continues to happen, please let us know

+
+
+
-
+ +
<% e.end_block(); %>
<% e.begin_block("scripts"); %> - - - - - + + + + + /* TODO: These globals shouldn't exist. */ + pad = require('ep_etherpad-lite/static/js/pad').pad; + chat = require('ep_etherpad-lite/static/js/chat').chat; + padeditbar = require('ep_etherpad-lite/static/js/pad_editbar').padeditbar; + padimpexp = require('ep_etherpad-lite/static/js/pad_impexp').padimpexp; + }()); + <% e.end_block(); %> From d75aeeaf8f6d66a8d539956e0ecfe52fc36cb205 Mon Sep 17 00:00:00 2001 From: 0ip Date: Mon, 16 Apr 2012 15:23:19 +0200 Subject: [PATCH 198/297] pad_editbar adapated hacky highlighting of currently opened module to recent changes --- src/static/js/pad_editbar.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/static/js/pad_editbar.js b/src/static/js/pad_editbar.js index 95d19505..dec32b46 100644 --- a/src/static/js/pad_editbar.js +++ b/src/static/js/pad_editbar.js @@ -182,7 +182,7 @@ var padeditbar = (function() //hide all modules if(moduleName == "none") { - $("#editbar ul#menu_right > li").removeClass("selected"); + $(".toolbar ul.menu_right li").removeClass("selected"); for(var i=0;i 0 && nth_child <= (modules.length-1)) { - $("#editbar ul#menu_right li:not(:nth-child(" + nth_child + "))").removeClass("selected"); - $("#editbar ul#menu_right li:nth-child(" + nth_child + ")").toggleClass("selected"); - } - if(modules[modules.length-1] === moduleName) $("#editbar ul#menu_right li").removeClass("selected"); + if (nth_child > 0 && nth_child <= (modules.length-1)) { + $(".toolbar ul.menu_right li:not(:nth-child(" + nth_child + "))").removeClass("selected"); + $(".toolbar ul.menu_right li:nth-child(" + nth_child + ")").toggleClass("selected"); + } + if(modules[modules.length-1] === moduleName) $(".toolbar ul.menu_right li").removeClass("selected"); //hide all modules that are not selected and show the selected one for(var i=0;i Date: Mon, 9 Apr 2012 16:22:09 +0200 Subject: [PATCH 199/297] Bugfix for this being wrong in editorInfo.ace_performDocumentApplyAttributesToRange --- src/static/js/ace2_inner.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/static/js/ace2_inner.js b/src/static/js/ace2_inner.js index b61c50e3..6e5f07bc 100644 --- a/src/static/js/ace2_inner.js +++ b/src/static/js/ace2_inner.js @@ -5401,7 +5401,9 @@ function Ace2Inner(){ // Init documentAttributeManager documentAttributeManager = new AttributeManager(rep, performDocumentApplyChangeset); - editorInfo.ace_performDocumentApplyAttributesToRange = documentAttributeManager.setAttributesOnRange; + editorInfo.ace_performDocumentApplyAttributesToRange = function () { + return documentAttributeManager.setAttributesOnRange.apply(documentAttributeManager, arguments); + }; $(document).ready(function(){ doc = document; // defined as a var in scope outside From 6f774bc6a567211a8a7157458c249d89a145c3ab Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Wed, 11 Apr 2012 18:07:19 +0200 Subject: [PATCH 200/297] Separated out the code for the plugin manager --- src/static/js/admin/plugins.js | 87 ++++++++++++++++++++++++++++++ src/templates/admin/plugins.html | 90 +------------------------------- 2 files changed, 88 insertions(+), 89 deletions(-) create mode 100644 src/static/js/admin/plugins.js diff --git a/src/static/js/admin/plugins.js b/src/static/js/admin/plugins.js new file mode 100644 index 00000000..4ed8a6c6 --- /dev/null +++ b/src/static/js/admin/plugins.js @@ -0,0 +1,87 @@ +$(document).ready(function () { + var socket = io.connect().of("/pluginfw/installer"); + + var doUpdate = false; + + function updateHandlers() { + $("#progress.dialog .close").unbind('click').click(function () { + $("#progress.dialog").hide(); + }); + + $("#do-search").unbind('click').click(function () { + if ($("#search-query")[0].value != "") + socket.emit("search", $("#search-query")[0].value); + }); + + $(".do-install").unbind('click').click(function (e) { + var row = $(e.target).closest("tr"); + doUpdate = true; + socket.emit("install", row.find(".name").html()); + }); + + $(".do-uninstall").unbind('click').click(function (e) { + var row = $(e.target).closest("tr"); + doUpdate = true; + socket.emit("uninstall", row.find(".name").html()); + }); + } + + updateHandlers(); + + socket.on('progress', function (data) { + $("#progress.dialog .close").hide(); + $("#progress.dialog").show(); + var message = "Unknown status"; + if (data.message) { + message = "" + data.message.toString() + ""; + } + if (data.error) { + message = "" + data.error.toString() + ""; + } + $("#progress.dialog .message").html(message); + $("#progress.dialog .history").append("
" + message + "
"); + + if (data.progress >= 1) { + if (data.error) { + $("#progress.dialog .close").show(); + } else { + if (doUpdate) { + doUpdate = false; + socket.emit("load"); + } + $("#progress.dialog").hide(); + } + } + }); + + socket.on('search-result', function (data) { + $("#search-results *").remove(); + for (plugin_name in data.results) { + var plugin = data.results[plugin_name]; + var row = $("#search-result-template").clone(); + + for (attr in plugin) { + row.find("." + attr).html(plugin[attr]); + } + $("#search-results").append(row); + } + updateHandlers(); + }); + + socket.on('installed-results', function (data) { + $("#installed-plugins *").remove(); + for (plugin_name in data.results) { + var plugin = data.results[plugin_name]; + var row = $("#installed-plugin-template").clone(); + + for (attr in plugin.package) { + row.find("." + attr).html(plugin.package[attr]); + } + $("#installed-plugins").append(row); + } + updateHandlers(); + }); + + socket.emit("load"); + +}); diff --git a/src/templates/admin/plugins.html b/src/templates/admin/plugins.html index 6f38d048..82bad555 100644 --- a/src/templates/admin/plugins.html +++ b/src/templates/admin/plugins.html @@ -4,95 +4,7 @@ - +
From 7ab7ee9f5ee1caedbf1ca5ac10934a269ecde8f6 Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Tue, 17 Apr 2012 22:18:43 +0200 Subject: [PATCH 201/297] Plugin admin fixes --- src/static/js/admin/plugins.js | 27 +++++++++++--- src/static/js/pluginfw/installer.js | 15 +++++--- src/templates/admin/plugins.html | 56 ++++++++++++++++------------- 3 files changed, 64 insertions(+), 34 deletions(-) diff --git a/src/static/js/admin/plugins.js b/src/static/js/admin/plugins.js index 4ed8a6c6..7f6c17b0 100644 --- a/src/static/js/admin/plugins.js +++ b/src/static/js/admin/plugins.js @@ -9,8 +9,10 @@ $(document).ready(function () { }); $("#do-search").unbind('click').click(function () { - if ($("#search-query")[0].value != "") - socket.emit("search", $("#search-query")[0].value); + socket.emit("search", { + pattern: $("#search-query")[0].value, + offset: $('#search-results').data('offset') || 0, + limit: 4}); }); $(".do-install").unbind('click').click(function (e) { @@ -29,8 +31,13 @@ $(document).ready(function () { updateHandlers(); socket.on('progress', function (data) { + if ($('#progress.dialog').data('progress') > data.progress) return; + $("#progress.dialog .close").hide(); $("#progress.dialog").show(); + + $('#progress.dialog').data('progress', data.progress); + var message = "Unknown status"; if (data.message) { message = "" + data.message.toString() + ""; @@ -55,16 +62,26 @@ $(document).ready(function () { }); socket.on('search-result', function (data) { - $("#search-results *").remove(); + var widget=$(".search-results"); + + widget.data('query', data.query); + widget.data('total', data.total); + + widget.find('.offset').html(data.qyery.offset); + widget.find('.limit').html(data.qyery.offset + data.qyery.offset.limit); + widget.find('.total').html(data.total); + + widget.find(".results *").remove(); for (plugin_name in data.results) { var plugin = data.results[plugin_name]; - var row = $("#search-result-template").clone(); + var row = widget.find(".template tr").clone(); for (attr in plugin) { row.find("." + attr).html(plugin[attr]); } - $("#search-results").append(row); + widget.find(".results").append(row); } + updateHandlers(); }); diff --git a/src/static/js/pluginfw/installer.js b/src/static/js/pluginfw/installer.js index 127a95aa..09bde920 100644 --- a/src/static/js/pluginfw/installer.js +++ b/src/static/js/pluginfw/installer.js @@ -55,7 +55,7 @@ exports.install = function(plugin_name, cb) { ); }; -exports.search = function(pattern, cb) { +exports.search = function(query, cb) { withNpm( function (cb) { registry.get( @@ -63,11 +63,18 @@ exports.search = function(pattern, cb) { function (er, data) { if (er) return cb(er); var res = {}; + var i = 0; for (key in data) { - if (key.indexOf(plugins.prefix) == 0 && key.indexOf(pattern) != -1) - res[key] = data[key]; + if (/* && key.indexOf(plugins.prefix) == 0 */ + key.indexOf(query.pattern) != -1) { + i++; + if (i > query.offset + && i <= query.offset + query.limit) { + res[key] = data[key]; + } + } } - cb(null, {results:res}); + cb(null, {results:res, query: query, total:i}); } ); }, diff --git a/src/templates/admin/plugins.html b/src/templates/admin/plugins.html index 82bad555..c1cc645a 100644 --- a/src/templates/admin/plugins.html +++ b/src/templates/admin/plugins.html @@ -40,31 +40,37 @@ -

Search for plugins to install

-
- - -
- - - - - - - - - - - - - - - - - -
NameDescription
- -
+
+

Search for plugins to install

+
+ + +
+ + + + + + + + + + + + + + + + + +
NameDescription
+ +
+ + .. of . + +
+

From d6f476312d7380e29d9995756c32a2b33134ab46 Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Wed, 18 Apr 2012 10:16:41 +0200 Subject: [PATCH 202/297] Spelling bugfixes --- src/static/js/admin/plugins.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/static/js/admin/plugins.js b/src/static/js/admin/plugins.js index 7f6c17b0..54454c2b 100644 --- a/src/static/js/admin/plugins.js +++ b/src/static/js/admin/plugins.js @@ -67,8 +67,8 @@ $(document).ready(function () { widget.data('query', data.query); widget.data('total', data.total); - widget.find('.offset').html(data.qyery.offset); - widget.find('.limit').html(data.qyery.offset + data.qyery.offset.limit); + widget.find('.offset').html(data.query.offset); + widget.find('.limit').html(data.query.offset + data.query.limit); widget.find('.total').html(data.total); widget.find(".results *").remove(); From 4c1d94343fe1b1a8ff02d7cfaef9f9506676d072 Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Wed, 18 Apr 2012 13:43:34 +0200 Subject: [PATCH 203/297] Better plugin admin interface --- src/node/hooks/express/adminplugins.js | 2 +- src/static/js/admin/plugins.js | 38 ++++++++++++++++++++++---- src/static/js/pluginfw/installer.js | 25 +++++++++++++---- 3 files changed, 54 insertions(+), 11 deletions(-) diff --git a/src/node/hooks/express/adminplugins.js b/src/node/hooks/express/adminplugins.js index fa7e7077..1d1320ab 100644 --- a/src/node/hooks/express/adminplugins.js +++ b/src/node/hooks/express/adminplugins.js @@ -27,7 +27,7 @@ exports.socketio = function (hook_name, args, cb) { socket.on("search", function (query) { socket.emit("progress", {progress:0, message:'Fetching results...'}); - installer.search(query, function (progress) { + installer.search(query, true, function (progress) { if (progress.results) socket.emit("search-result", progress); socket.emit("progress", progress); diff --git a/src/static/js/admin/plugins.js b/src/static/js/admin/plugins.js index 54454c2b..6ae085c2 100644 --- a/src/static/js/admin/plugins.js +++ b/src/static/js/admin/plugins.js @@ -1,18 +1,28 @@ $(document).ready(function () { var socket = io.connect().of("/pluginfw/installer"); + $('.search-results').data('query', { + pattern: '', + offset: 0, + limit: 4, + }); + var doUpdate = false; + var search = function () { + socket.emit("search", $('.search-results').data('query')); + } + function updateHandlers() { $("#progress.dialog .close").unbind('click').click(function () { $("#progress.dialog").hide(); }); $("#do-search").unbind('click').click(function () { - socket.emit("search", { - pattern: $("#search-query")[0].value, - offset: $('#search-results').data('offset') || 0, - limit: 4}); + var query = $('.search-results').data('query'); + query.pattern = $("#search-query")[0].value; + query.offset = 0; + search(); }); $(".do-install").unbind('click').click(function (e) { @@ -26,12 +36,29 @@ $(document).ready(function () { doUpdate = true; socket.emit("uninstall", row.find(".name").html()); }); + + $(".do-prev-page").unbind('click').click(function (e) { + var query = $('.search-results').data('query'); + query.offset -= query.limit; + if (query.offset < 0) { + query.offset = 0; + } + search(); + }); + $(".do-next-page").unbind('click').click(function (e) { + var query = $('.search-results').data('query'); + var total = $('.search-results').data('total'); + if (query.offset + query.limit < total) { + query.offset += query.limit; + } + search(); + }); } updateHandlers(); socket.on('progress', function (data) { - if ($('#progress.dialog').data('progress') > data.progress) return; + if (data.progress > 0 && $('#progress.dialog').data('progress') > data.progress) return; $("#progress.dialog .close").hide(); $("#progress.dialog").show(); @@ -100,5 +127,6 @@ $(document).ready(function () { }); socket.emit("load"); + search(); }); diff --git a/src/static/js/pluginfw/installer.js b/src/static/js/pluginfw/installer.js index 09bde920..1bb8db9e 100644 --- a/src/static/js/pluginfw/installer.js +++ b/src/static/js/pluginfw/installer.js @@ -55,18 +55,33 @@ exports.install = function(plugin_name, cb) { ); }; -exports.search = function(query, cb) { +exports.searchCache = null; + +exports.search = function(query, cache, cb) { withNpm( function (cb) { - registry.get( - "/-/all", null, 600, false, true, + var getData = function (cb) { + if (cache && exports.searchCache) { + cb(null, exports.searchCache); + } else { + registry.get( + "/-/all", null, 600, false, true, + function (er, data) { + if (er) return cb(er); + exports.searchCache = data; + cb(er, data); + } + ); + } + } + getData( function (er, data) { if (er) return cb(er); var res = {}; var i = 0; for (key in data) { - if (/* && key.indexOf(plugins.prefix) == 0 */ - key.indexOf(query.pattern) != -1) { + if ( key.indexOf(plugins.prefix) == 0 + && key.indexOf(query.pattern) != -1) { i++; if (i > query.offset && i <= query.offset + query.limit) { From da75b87d3c90ecd27dfe9d1f8b583e9db38de7a7 Mon Sep 17 00:00:00 2001 From: Martyn York Date: Wed, 18 Apr 2012 14:44:25 -0700 Subject: [PATCH 204/297] added new hook 'acePostWriteDomLineHTML' which gets called after a domline is created and has been added to the page. Also fixed problems with ReferenceExceptions due to require-kernel not being sent to the iframe. --- src/static/js/ace.js | 8 +++++++- src/static/js/domline.js | 4 ++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/static/js/ace.js b/src/static/js/ace.js index 6ea2938b..85801d33 100644 --- a/src/static/js/ace.js +++ b/src/static/js/ace.js @@ -167,7 +167,13 @@ require.setGlobalKeyPath("require");\n\ buffer.push(Ace2Editor.EMBEDED[KERNEL_SOURCE]); buffer.push(KERNEL_BOOT); buffer.push('<\/script>'); - } + } else { + file = KERNEL_SOURCE; + buffer.push(' - - - - -
- - <% if (errors.length) { %> -
- <% errors.forEach(function (item) { %> -
<%= item.toString() %>
- <% }) %> -
- <% } %> - - -

Installed plugins

- - - - - - - - - - - - - - - - - -
NameDescription
- -
- -
-

Search for plugins to install

-
- - -
- - - - - - - - - - - - - - - - - -
NameDescription
- -
- - .. of . - -
- - -
-

- Please wait: - -

-
-
-
- - + + + Plugin manager + + + + + + +
+ + <% if (errors.length) { %> +
+ <% errors.forEach(function (item) { %> +
<%= item.toString() %>
+ <% }) %> +
+ <% } %> + + +

Etherpad Lite

+
+

Installed plugins

+ + + + + + + + + + + + + + + + + +
NameDescription
+ +
+ +
+
+

Search for plugins to install

+
+ + +
+ + + + + + + + + + + + + + + + + +
NameDescription
+ +
+ + .. of . + +
+ +
+

+ Please wait: + +

+
+
+
+ + From 31909f6e60b699710f6a08c0ef593b1b3982b22e Mon Sep 17 00:00:00 2001 From: 0ip Date: Thu, 19 Apr 2012 17:04:44 +0200 Subject: [PATCH 210/297] Added viewport --- src/templates/admin/plugins.html | 1 + 1 file changed, 1 insertion(+) diff --git a/src/templates/admin/plugins.html b/src/templates/admin/plugins.html index 2f98e019..6e9b4d2e 100644 --- a/src/templates/admin/plugins.html +++ b/src/templates/admin/plugins.html @@ -1,6 +1,7 @@ Plugin manager + From a743112170615a14f4e4e27822a54dc3ec491a6b Mon Sep 17 00:00:00 2001 From: 0ip Date: Thu, 19 Apr 2012 19:44:44 +0300 Subject: [PATCH 211/297] Fix #626, Plugins don't work if pad is on a subdir --- src/static/js/pluginfw/plugins.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/static/js/pluginfw/plugins.js b/src/static/js/pluginfw/plugins.js index e6cb5190..b66af58a 100644 --- a/src/static/js/pluginfw/plugins.js +++ b/src/static/js/pluginfw/plugins.js @@ -90,7 +90,7 @@ if (exports.isClient) { // which appears to fix the issue. var callback = function () {setTimeout(cb, 0);}; - jQuery.getJSON('/pluginfw/plugin-definitions.json', function(data) { + jQuery.getJSON('../pluginfw/plugin-definitions.json', function(data) { exports.plugins = data.plugins; exports.parts = data.parts; exports.hooks = exports.extractHooks(exports.parts, "client_hooks"); From f809b0d6c8c4c9f3d1f9ae7b8e36cdf7af117bc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Bartelme=C3=9F?= Date: Fri, 20 Apr 2012 12:03:11 +0200 Subject: [PATCH 212/297] removing de-facto noop --- src/static/js/ace.js | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/static/js/ace.js b/src/static/js/ace.js index 6ea2938b..0b115262 100644 --- a/src/static/js/ace.js +++ b/src/static/js/ace.js @@ -239,14 +239,6 @@ require.setGlobalKeyPath("require");\n\ iframeHTML: iframeHTML }); - // For compatability's sake transform in and out. - for (var i = 0, ii = iframeHTML.length; i < ii; i++) { - iframeHTML[i] = JSON.stringify(iframeHTML[i]); - } - for (var i = 0, ii = iframeHTML.length; i < ii; i++) { - iframeHTML[i] = JSON.parse(iframeHTML[i]); - } - // calls to these functions ($$INCLUDE_...) are replaced when this file is processed // and compressed, putting the compressed code from the named file directly into the // source here. From 23bbe4ab5a7dcfad0cfe3e4f4a30f4e426aed15e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Bartelme=C3=9F?= Date: Fri, 20 Apr 2012 12:03:38 +0200 Subject: [PATCH 213/297] undo-xpopup seems to be unused --- src/node/utils/tar.json | 2 -- src/static/js/pad.js | 1 - src/static/js/timeslider.js | 1 - src/static/js/undo-xpopup.js | 34 ---------------------------------- 4 files changed, 38 deletions(-) delete mode 100644 src/static/js/undo-xpopup.js diff --git a/src/node/utils/tar.json b/src/node/utils/tar.json index 5c1abac5..e691334d 100644 --- a/src/node/utils/tar.json +++ b/src/node/utils/tar.json @@ -6,7 +6,6 @@ , "pad.js" , "ace2_common.js" , "pad_utils.js" - , "undo-xpopup.js" , "json2.js" , "pad_cookie.js" , "pad_editor.js" @@ -27,7 +26,6 @@ "jquery.js" , "underscore.js" , "security.js" - , "undo-xpopup.js" , "json2.js" , "colorutils.js" , "draggable.js" diff --git a/src/static/js/pad.js b/src/static/js/pad.js index 3a1c1633..5826823c 100644 --- a/src/static/js/pad.js +++ b/src/static/js/pad.js @@ -30,7 +30,6 @@ require('./jquery'); require('./farbtastic'); require('./excanvas'); JSON = require('./json2'); -require('./undo-xpopup'); var chat = require('./chat').chat; var getCollabClient = require('./collab_client').getCollabClient; diff --git a/src/static/js/timeslider.js b/src/static/js/timeslider.js index 438b1695..fd70a532 100644 --- a/src/static/js/timeslider.js +++ b/src/static/js/timeslider.js @@ -24,7 +24,6 @@ // assigns to the global `$` and augments it with plugins. require('./jquery'); JSON = require('./json2'); -require('./undo-xpopup'); var createCookie = require('./pad_utils').createCookie; var readCookie = require('./pad_utils').readCookie; diff --git a/src/static/js/undo-xpopup.js b/src/static/js/undo-xpopup.js deleted file mode 100644 index e733f3ea..00000000 --- a/src/static/js/undo-xpopup.js +++ /dev/null @@ -1,34 +0,0 @@ -/** - * This code is mostly from the old Etherpad. Please help us to comment this code. - * This helps other people to understand this code better and helps them to improve it. - * TL;DR COMMENTS ON THIS FILE ARE HIGHLY APPRECIATED - */ - -/** - * Copyright 2009 Google Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS-IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -if (window._orig_windowOpen) -{ - window.open = _orig_windowOpen; -} -if (window._orig_windowSetTimeout) -{ - window.setTimeout = _orig_windowSetTimeout; -} -if (window._orig_windowSetInterval) -{ - window.setInterval = _orig_windowSetInterval; -} From e661f653b194bb04211259867b1bfca0cb3fd00d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Bartelme=C3=9F?= Date: Fri, 20 Apr 2012 12:15:09 +0200 Subject: [PATCH 214/297] sharebox and Feedback are not used. Removing them --- src/static/css/pad.css | 21 +-- src/static/js/pad_modals.js | 301 ------------------------------------ 2 files changed, 1 insertion(+), 321 deletions(-) diff --git a/src/static/css/pad.css b/src/static/css/pad.css index 2ce8dbb6..948f0245 100644 --- a/src/static/css/pad.css +++ b/src/static/css/pad.css @@ -883,15 +883,6 @@ down on the page in IE. Strange but it works! */ line-height: 18px; padding: 2px; } -#sharebox-send { - float: right; - background-repeat: no-repeat; - background-image: url(static/img/sharebox4.gif); - display: block; - width: 87px; - height: 22px; - background-position: -383px -289px; -} #viewbarcontents { display: none } @@ -949,17 +940,7 @@ down on the page in IE. Strange but it works! */ .sidebarchecked { background-position: -1px -67px } -#feedbackbutton { - display: block; - position: absolute; - width: 68px; - height: 0; - padding-top: 17px; - overflow: hidden; - background: url(static/img/bottomareagfx.gif); - top: 5px; - right: 220px; -} + #modaloverlay { z-index: 500; display: none; diff --git a/src/static/js/pad_modals.js b/src/static/js/pad_modals.js index 0dd281bb..480074c5 100644 --- a/src/static/js/pad_modals.js +++ b/src/static/js/pad_modals.js @@ -20,165 +20,13 @@ * limitations under the License. */ -var padutils = require('./pad_utils').padutils; -var paddocbar = require('./pad_docbar').paddocbar; - var padmodals = (function() { - -/*var clearFeedbackEmail = function() {}; - function clearFeedback() { - clearFeedbackEmail(); - $("#feedbackbox-message").val(''); - } - - var sendingFeedback = false; - function setSendingFeedback(v) { - v = !! v; - if (sendingFeedback != v) { - sendingFeedback = v; - if (v) { - $("#feedbackbox-send").css('opacity', 0.75); - } - else { - $("#feedbackbox-send").css('opacity', 1); - } - } - }*/ - - var sendingInvite = false; - - function setSendingInvite(v) - { - v = !! v; - if (sendingInvite != v) - { - sendingInvite = v; - if (v) - { - $(".sharebox-send").css('opacity', 0.75); - } - else - { - $("#sharebox-send").css('opacity', 1); - } - } - } - - var clearShareBoxTo = function() - {}; - - function clearShareBox() - { - clearShareBoxTo(); - } - var pad = undefined; var self = { init: function(_pad) { pad = _pad; - - self.initFeedback(); - self.initShareBox(); - }, - initFeedback: function() - { -/*var emailField = $("#feedbackbox-email"); - clearFeedbackEmail = - padutils.makeFieldLabeledWhenEmpty(emailField, '(your email address)').clear; - clearFeedback();*/ - - $("#feedbackbox-hide").click(function() - { - self.hideModal(); - }); -/*$("#feedbackbox-send").click(function() { - self.sendFeedbackEmail(); - });*/ - - $("#feedbackbutton").click(function() - { - self.showFeedback(); - }); - }, - initShareBox: function() - { - $("#sharebutton").click(function() - { - self.showShareBox(); - }); - $("#sharebox-hide").click(function() - { - self.hideModal(); - }); - $("#sharebox-send").click(function() - { - self.sendInvite(); - }); - - $("#sharebox-url").click(function() - { - $("#sharebox-url").focus().select(); - }); - - clearShareBoxTo = padutils.makeFieldLabeledWhenEmpty($("#sharebox-to"), "(email addresses)").clear; - clearShareBox(); - - $("#sharebox-subject").val(self.getDefaultShareBoxSubjectForName(pad.getUserName())); - $("#sharebox-message").val(self.getDefaultShareBoxMessageForName(pad.getUserName())); - - $("#sharebox-stripe .setsecurity").click(function() - { - self.hideModal(); - paddocbar.setShownPanel('security'); - }); - }, - getDefaultShareBoxMessageForName: function(name) - { - return (name || "Somebody") + " has shared an EtherPad document with you." + "\n\n" + "View it here:\n\n" + padutils.escapeHtml($(".sharebox-url").val() + "\n"); - }, - getDefaultShareBoxSubjectForName: function(name) - { - return (name || "Somebody") + " invited you to an EtherPad document"; - }, - relayoutWithBottom: function(px) - { - $("#modaloverlay").height(px); - $("#sharebox").css('left', Math.floor(($(window).width() - $("#sharebox").outerWidth()) / 2)); - $("#feedbackbox").css('left', Math.floor(($(window).width() - $("#feedbackbox").outerWidth()) / 2)); - }, - showFeedback: function() - { - self.showModal("#feedbackbox"); - }, - showShareBox: function() - { - // when showing the dialog, if it still says "Somebody" invited you - // then we fill in the updated username if there is one; - // otherwise, we don't touch it, perhaps the user is happy with it - var msgbox = $("#sharebox-message"); - if (msgbox.val() == self.getDefaultShareBoxMessageForName(null)) - { - msgbox.val(self.getDefaultShareBoxMessageForName(pad.getUserName())); - } - var subjBox = $("#sharebox-subject"); - if (subjBox.val() == self.getDefaultShareBoxSubjectForName(null)) - { - subjBox.val(self.getDefaultShareBoxSubjectForName(pad.getUserName())); - } - - if (pad.isPadPublic()) - { - $("#sharebox-stripe").get(0).className = 'sharebox-stripe-public'; - } - else - { - $("#sharebox-stripe").get(0).className = 'sharebox-stripe-private'; - } - - self.showModal("#sharebox", 500); - $("#sharebox-url").focus().select(); }, showModal: function(modalId, duration) { @@ -218,155 +66,6 @@ var padmodals = (function() $("#modaloverlay").hide(); }); }, - hideFeedbackLaterIfNoOtherInteraction: function() - { - return padutils.getCancellableAction('hide-feedbackbox', function() - { - self.hideModal(); - }); - }, - hideShareboxLaterIfNoOtherInteraction: function() - { - return padutils.getCancellableAction('hide-sharebox', function() - { - self.hideModal(); - }); - }, -/* sendFeedbackEmail: function() { - if (sendingFeedback) { - return; - } - var message = $("#feedbackbox-message").val(); - if (! message) { - return; - } - var email = ($("#feedbackbox-email").hasClass('editempty') ? '' : - $("#feedbackbox-email").val()); - var padId = pad.getPadId(); - var username = pad.getUserName(); - setSendingFeedback(true); - $("#feedbackbox-response").html("Sending...").get(0).className = ''; - $("#feedbackbox-response").show(); - $.ajax({ - type: 'post', - url: '/ep/pad/feedback', - data: { - feedback: message, - padId: padId, - username: username, - email: email - }, - success: success, - error: error - }); - var hideCall = self.hideFeedbackLaterIfNoOtherInteraction(); - function success(msg) { - setSendingFeedback(false); - clearFeedback(); - $("#feedbackbox-response").html("Thanks for your feedback").get(0).className = 'goodresponse'; - $("#feedbackbox-response").show(); - window.setTimeout(function() { - $("#feedbackbox-response").fadeOut('slow', function() { - hideCall(); - }); - }, 1500); - } - function error(e) { - setSendingFeedback(false); - $("#feedbackbox-response").html("Could not send feedback. Please email us at feedback"+"@"+"etherpad.com instead.").get(0).className = 'badresponse'; - $("#feedbackbox-response").show(); - } - },*/ - sendInvite: function() - { - if (sendingInvite) - { - return; - } - if (!pad.isFullyConnected()) - { - displayErrorMessage("Error: Connection to the server is down or flaky."); - return; - } - var message = $("#sharebox-message").val(); - if (!message) - { - displayErrorMessage("Please enter a message body before sending."); - return; - } - var emails = ($("#sharebox-to").hasClass('editempty') ? '' : $("#sharebox-to").val()) || ''; - // find runs of characters that aren't obviously non-email punctuation - var emailArray = emails.match(/[^\s,:;<>\"\'\/\(\)\[\]{}]+/g) || []; - if (emailArray.length == 0) - { - displayErrorMessage('Please enter at least one "To:" address.'); - $("#sharebox-to").focus().select(); - return; - } - for (var i = 0; i < emailArray.length; i++) - { - var addr = emailArray[i]; - if (!addr.match(/^[\w\.\_\+\-]+\@[\w\_\-]+\.[\w\_\-\.]+$/)) - { - displayErrorMessage('"' + padutils.escapeHtml(addr) + '" does not appear to be a valid email address.'); - return; - } - } - var subject = $("#sharebox-subject").val(); - if (!subject) - { - subject = self.getDefaultShareBoxSubjectForName(pad.getUserName()); - $("#sharebox-subject").val(subject); // force the default subject - } - - var padId = pad.getPadId(); - var username = pad.getUserName(); - setSendingInvite(true); - $("#sharebox-response").html("Sending...").get(0).className = ''; - $("#sharebox-response").show(); - $.ajax( - { - type: 'post', - url: '/ep/pad/emailinvite', - data: { - message: message, - toEmails: emailArray.join(','), - subject: subject, - username: username, - padId: padId - }, - success: success, - error: error - }); - var hideCall = self.hideShareboxLaterIfNoOtherInteraction(); - - function success(msg) - { - setSendingInvite(false); - $("#sharebox-response").html("Email invitation sent!").get(0).className = 'goodresponse'; - $("#sharebox-response").show(); - window.setTimeout(function() - { - $("#sharebox-response").fadeOut('slow', function() - { - hideCall(); - }); - }, 1500); - } - - function error(e) - { - setSendingFeedback(false); - $("#sharebox-response").html("An error occurred; no email was sent.").get(0).className = 'badresponse'; - $("#sharebox-response").show(); - } - - function displayErrorMessage(msgHtml) - { - $("#sharebox-response").html(msgHtml).get(0).className = 'badresponse'; - $("#sharebox-response").show(); - } - } }; return self; }()); From 07ee836946412ec0f49a5c87152d17e6446e3828 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Bartelme=C3=9F?= Date: Fri, 20 Apr 2012 12:19:09 +0200 Subject: [PATCH 215/297] set view zoom is unused --- src/static/css/pad.css | 4 +--- src/static/js/pad_editor.js | 31 ------------------------------- 2 files changed, 1 insertion(+), 34 deletions(-) diff --git a/src/static/css/pad.css b/src/static/css/pad.css index 948f0245..d184214c 100644 --- a/src/static/css/pad.css +++ b/src/static/css/pad.css @@ -894,9 +894,7 @@ down on the page in IE. Strange but it works! */ line-height: 20px; width: auto; } -#viewzoommenu { - width: 65px -} + #bottomarea { height: 28px; overflow: hidden; diff --git a/src/static/js/pad_editor.js b/src/static/js/pad_editor.js index b8a4ea0e..84c2e027 100644 --- a/src/static/js/pad_editor.js +++ b/src/static/js/pad_editor.js @@ -58,7 +58,6 @@ var padeditor = (function() self.setViewOptions(initialViewOptions); // view bar - self.initViewZoom(); $("#viewbarcontents").show(); }, initViewOptions: function() @@ -105,36 +104,6 @@ var padeditor = (function() self.ace.setProperty("textface", (v ? "monospace" : "Arial, sans-serif")); $("#viewfontmenu").val(v ? "monospace" : "normal"); }, - initViewZoom: function() - { - var viewZoom = Number(padcookie.getPref('viewZoom')); - if ((!viewZoom) || isNaN(viewZoom)) - { - viewZoom = 100; - } - self.setViewZoom(viewZoom); - $("#viewzoommenu").change(function(evt) - { - // strip initial 'z' from val - self.setViewZoom(Number($("#viewzoommenu").val().substring(1))); - }); - }, - setViewZoom: function(percent) - { - if (!(percent >= 50 && percent <= 1000)) - { - // percent is out of sane range or NaN (which fails comparisons) - return; - } - - self.viewZoom = percent; - $("#viewzoommenu").val('z' + percent); - - var baseSize = 13; - self.ace.setProperty('textsize', Math.round(baseSize * self.viewZoom / 100)); - - padcookie.setPref('viewZoom', percent); - }, dispose: function() { if (self.ace) From ab7f7506b96392cda68272549df1ce3e4eabbbec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Bartelme=C3=9F?= Date: Fri, 20 Apr 2012 13:32:43 +0200 Subject: [PATCH 216/297] removed unused functions in collab_client --- src/static/js/collab_client.js | 105 --------------------------------- 1 file changed, 105 deletions(-) diff --git a/src/static/js/collab_client.js b/src/static/js/collab_client.js index 18e3616b..f7e2a07a 100644 --- a/src/static/js/collab_client.js +++ b/src/static/js/collab_client.js @@ -189,95 +189,15 @@ function getCollabClient(ace2editor, serverVars, initialUserInfo, options, _pad) function setUpSocket() { - //oldSocketId = String(Math.floor(Math.random()*1e12)); - //socketId = String(Math.floor(Math.random()*1e12)); -/*socket = new io.Socket(); - socket.connect();*/ - - //socket.on('connect', function(){ hiccupCount = 0; setChannelState("CONNECTED"); -/*var msg = { type:"CLIENT_READY", roomType:'padpage', - roomName:'padpage/'+globalPadId, - data: { - lastRev:rev, - userInfo:userSet[userId], - stats: getStats() } }; - if (oldSocketId) { - msg.data.isReconnectOf = oldSocketId; - msg.data.isCommitPending = (state == "COMMITTING"); - } - sendMessage(msg);*/ doDeferredActions(); initialStartConnectTime = +new Date(); - // }); -/*socket.on('message', function(obj){ - if(window.console) - console.log(obj); - handleMessageFromServer(obj); - });*/ - -/*var success = false; - callCatchingErrors("setUpSocket", function() { - appLevelDisconnectReason = null; - - var oldSocketId = socketId; - socketId = String(Math.floor(Math.random()*1e12)); - socket = new WebSocket(socketId); - socket.onmessage = wrapRecordingErrors("socket.onmessage", handleMessageFromServer); - socket.onclosed = wrapRecordingErrors("socket.onclosed", handleSocketClosed); - socket.onopen = wrapRecordingErrors("socket.onopen", function() { - hiccupCount = 0; - setChannelState("CONNECTED"); - var msg = { type:"CLIENT_READY", roomType:'padpage', - roomName:'padpage/'+globalPadId, - data: { - lastRev:rev, - userInfo:userSet[userId], - stats: getStats() } }; - if (oldSocketId) { - msg.data.isReconnectOf = oldSocketId; - msg.data.isCommitPending = (state == "COMMITTING"); - } - sendMessage(msg); - doDeferredActions(); - }); - socket.onhiccup = wrapRecordingErrors("socket.onhiccup", handleCometHiccup); - socket.onlogmessage = dmesg; - socket.connect(); - success = true; - }); - if (success) { - initialStartConnectTime = +new Date(); - } - else { - abandonConnection("initsocketfail"); - }*/ } var hiccupCount = 0; - function handleCometHiccup(params) - { - dmesg("HICCUP (connected:" + ( !! params.connected) + ")"); - var connectedNow = params.connected; - if (!connectedNow) - { - hiccupCount++; - // skip first "cut off from server" notification - if (hiccupCount > 1) - { - setChannelState("RECONNECTING"); - } - } - else - { - hiccupCount = 0; - setChannelState("CONNECTED"); - } - } - function sendMessage(msg) { getSocket().json.send( @@ -678,29 +598,4 @@ function getCollabClient(ace2editor, serverVars, initialUserInfo, options, _pad) return self; } -function selectElementContents(elem) -{ - if ($.browser.msie) - { - var range = document.body.createTextRange(); - range.moveToElementText(elem); - range.select(); - } - else - { - if (window.getSelection) - { - var browserSelection = window.getSelection(); - if (browserSelection) - { - var range = document.createRange(); - range.selectNodeContents(elem); - browserSelection.removeAllRanges(); - browserSelection.addRange(range); - } - } - } -} - exports.getCollabClient = getCollabClient; -exports.selectElementContents = selectElementContents; From 709a3b1dbec44488c381fc85ebdf270d5ad0e7ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Bartelme=C3=9F?= Date: Fri, 20 Apr 2012 13:34:35 +0200 Subject: [PATCH 217/297] removing debug code in collab_client.js --- src/static/js/collab_client.js | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/static/js/collab_client.js b/src/static/js/collab_client.js index f7e2a07a..437942c8 100644 --- a/src/static/js/collab_client.js +++ b/src/static/js/collab_client.js @@ -302,13 +302,11 @@ function getCollabClient(ace2editor, serverVars, initialUserInfo, options, _pad) { userSet[id] = userInfo; callbacks.onUpdateUserInfo(userInfo); - dmesgUsers(); } else { userSet[id] = userInfo; callbacks.onUserJoin(userInfo); - dmesgUsers(); } tellAceActiveAuthorInfo(userInfo); } @@ -321,7 +319,6 @@ function getCollabClient(ace2editor, serverVars, initialUserInfo, options, _pad) delete userSet[userInfo.userId]; fadeAceAuthorInfo(userInfo); callbacks.onUserLeave(userInfo); - dmesgUsers(); } } else if (msg.type == "DISCONNECT_REASON") @@ -405,11 +402,6 @@ function getCollabClient(ace2editor, serverVars, initialUserInfo, options, _pad) } } - function dmesgUsers() - { - //pad.dmesg($.map(getConnectedUsers(), function(u) { return u.userId.slice(-2); }).join(',')); - } - function setChannelState(newChannelState, moreInfo) { if (newChannelState != channelState) From 8593b1905c51e2be8aec630ea13586301c6f0b1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Bartelme=C3=9F?= Date: Fri, 20 Apr 2012 14:24:44 +0200 Subject: [PATCH 218/297] getRepHTML seems to be unused. Removing --- src/static/js/ace2_inner.js | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/src/static/js/ace2_inner.js b/src/static/js/ace2_inner.js index 6e5f07bc..0e15195c 100644 --- a/src/static/js/ace2_inner.js +++ b/src/static/js/ace2_inner.js @@ -3749,24 +3749,6 @@ function Ace2Inner(){ setSelection(selection); } - function getRepHTML() - { - return _.map(rep.lines.slice(), function(entry) - { - var text = entry.text; - var content; - if (text.length === 0) - { - content = '--'; - } - else - { - content = htmlPrettyEscape(text); - } - return '
' + content + '
'; - }).join(''); - } - function nodeMaxIndex(nd) { if (isNodeText(nd)) return nd.nodeValue.length; From 89ab73c8683f4473671162bda5f1774d9645ca6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Bartelme=C3=9F?= Date: Fri, 20 Apr 2012 14:25:07 +0200 Subject: [PATCH 219/297] removing commented out functions from cssmanager.js --- src/static/js/cssmanager.js | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/src/static/js/cssmanager.js b/src/static/js/cssmanager.js index 46075e57..952388b7 100644 --- a/src/static/js/cssmanager.js +++ b/src/static/js/cssmanager.js @@ -40,21 +40,8 @@ function makeCSSManager(emptyStylesheetTitle, top) } return null; } - -/*function getSheetTagByTitle(title) { - var allStyleTags = document.getElementsByTagName("style"); - for(var i=0;i Date: Fri, 20 Apr 2012 14:37:53 +0200 Subject: [PATCH 220/297] Bugfix for recursive dependency-installation and paths --- src/node/eejs/index.js | 27 ++++++++++++++++++++++----- src/static/js/pluginfw/plugins.js | 27 ++++++++++++++++++++------- 2 files changed, 42 insertions(+), 12 deletions(-) diff --git a/src/node/eejs/index.js b/src/node/eejs/index.js index 90c69e59..2fc44168 100644 --- a/src/node/eejs/index.js +++ b/src/node/eejs/index.js @@ -23,6 +23,7 @@ var ejs = require("ejs"); var fs = require("fs"); var path = require("path"); var hooks = require("ep_etherpad-lite/static/js/pluginfw/hooks.js"); +var resolve = require("resolve"); exports.info = { buf_stack: [], @@ -91,13 +92,29 @@ exports.inherit = function (name, args) { exports.info.file_stack[exports.info.file_stack.length-1].inherit.push({name:name, args:args}); } -exports.require = function (name, args) { +exports.require = function (name, args, mod) { if (args == undefined) args = {}; - - if ((name.indexOf("./") == 0 || name.indexOf("../") == 0) && exports.info.file_stack.length) { - name = path.join(path.dirname(exports.info.file_stack[exports.info.file_stack.length-1].path), name); + + var basedir = __dirname; + var paths = []; + + if (exports.info.file_stack.length) { + basedir = path.dirname(exports.info.file_stack[exports.info.file_stack.length-1].path); } - var ejspath = require.resolve(name) + if (mod) { + basedir = path.dirname(mod.filename); + paths = mod.paths; + } + + console.log(["looking up", name, "in", basedir, paths, mod]); + var ejspath = resolve.sync( + name, + { + paths : paths, + basedir : basedir, + extensions : [ '.html', '.ejs' ], + } + ) args.e = exports; args.require = require; diff --git a/src/static/js/pluginfw/plugins.js b/src/static/js/pluginfw/plugins.js index e6cb5190..f33b9a12 100644 --- a/src/static/js/pluginfw/plugins.js +++ b/src/static/js/pluginfw/plugins.js @@ -61,7 +61,7 @@ exports.loadFn = function (path, hookName) { return fn; }; -exports.extractHooks = function (parts, hook_set_name) { +exports.extractHooks = function (parts, hook_set_name, plugins) { var hooks = {}; _.each(parts,function (part) { _.chain(part[hook_set_name] || {}) @@ -69,14 +69,27 @@ exports.extractHooks = function (parts, hook_set_name) { .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(hook_fn_name, hook_name); + + /* On the server side, you can't just + * require("pluginname/whatever") if the plugin is installed as + * a dependency of another plugin! Bah, pesky little details of + * npm... */ + if (!exports.isClient) { + hook_fn_name = path.normalize(path.join(path.dirname(exports.plugins[part.plugin].package.path), hook_fn_name)); + } + + try { + var hook_fn = exports.loadFn(hook_fn_name, hook_name); + if (!hook_fn) { + throw "Not a function"; + } + } catch (exc) { + console.error("Failed to load '" + hook_fn_name + "' for '" + part.full_name + "/" + hook_set_name + "/" + hook_name + "': " + exc.toString()) + } if (hook_fn) { hooks[hook_name].push({"hook_name": hook_name, "hook_fn": hook_fn, "hook_fn_name": hook_fn_name, "part": part}); - } else { - console.error("Unable to load hook function for " + part.full_name + " for hook " + hook_name + ": " + part.hooks[hook_name]); - } + } }); }); return hooks; @@ -139,7 +152,7 @@ exports.update = function (cb) { if (err) cb(err); exports.plugins = plugins; exports.parts = exports.sortParts(parts); - exports.hooks = exports.extractHooks(exports.parts, "hooks"); + exports.hooks = exports.extractHooks(exports.parts, "hooks"); exports.loaded = true; exports.callInit(cb); } From 9a67a3a1db07efec03638477aef24daf969b6752 Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Fri, 20 Apr 2012 15:08:50 +0200 Subject: [PATCH 221/297] Removed debug print --- src/node/eejs/index.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/node/eejs/index.js b/src/node/eejs/index.js index 2fc44168..2d02a45a 100644 --- a/src/node/eejs/index.js +++ b/src/node/eejs/index.js @@ -106,7 +106,6 @@ exports.require = function (name, args, mod) { paths = mod.paths; } - console.log(["looking up", name, "in", basedir, paths, mod]); var ejspath = resolve.sync( name, { From 9691f02765615d4136e9e71ac1bf7f2d2153e7db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Bartelme=C3=9F?= Date: Fri, 20 Apr 2012 15:12:20 +0200 Subject: [PATCH 222/297] removing Minify.js.rej --- src/node/utils/Minify.js.rej | 513 ----------------------------------- 1 file changed, 513 deletions(-) delete mode 100644 src/node/utils/Minify.js.rej diff --git a/src/node/utils/Minify.js.rej b/src/node/utils/Minify.js.rej deleted file mode 100644 index f09f49dc..00000000 --- a/src/node/utils/Minify.js.rej +++ /dev/null @@ -1,513 +0,0 @@ -/** - * This Module manages all /minified/* requests. It controls the - * minification && compression of Javascript and CSS. - */ - -/* - * 2011 Peter 'Pita' Martischka (Primary Technology Ltd) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS-IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -var ERR = require("async-stacktrace"); -var settings = require('./Settings'); -var async = require('async'); -var fs = require('fs'); -var cleanCSS = require('clean-css'); -var jsp = require("uglify-js").parser; -var pro = require("uglify-js").uglify; -var path = require('path'); -var RequireKernel = require('require-kernel'); -var server = require('../server'); - -<<<<<<< HEAD -var ROOT_DIR = path.normalize(__dirname + "/../" ); -var JS_DIR = ROOT_DIR + '../static/js/'; -var CSS_DIR = ROOT_DIR + '../static/css/'; -var CACHE_DIR = path.join(settings.root, 'var'); -======= -var ROOT_DIR = path.normalize(__dirname + "/../../static/"); ->>>>>>> pita -var TAR_PATH = path.join(__dirname, 'tar.json'); -var tar = JSON.parse(fs.readFileSync(TAR_PATH, 'utf8')); - -// Rewrite tar to include modules with no extensions and proper rooted paths. -exports.tar = {}; -for (var key in tar) { - exports.tar['/' + key] = - tar[key].map(function (p) {return '/' + p}).concat( - tar[key].map(function (p) {return '/' + p.replace(/\.js$/, '')}) - ); -} - -/** - * creates the minifed javascript for the given minified name - * @param req the Express request - * @param res the Express response - */ -exports.minify = function(req, res, next) -{ -<<<<<<< HEAD - var jsFilename = req.params[0]; - - //choose the js files we need - var jsFiles = undefined; - if (Object.prototype.hasOwnProperty.call(tar, jsFilename)) { - jsFiles = tar[jsFilename]; - } else { - /* Not in tar list, but try anyways, if it fails, pass to `next`. - Actually try, not check in filesystem here because - we don't want to duplicate the require.resolve() handling - */ - jsFiles = [jsFilename]; - } - _handle(req, res, jsFilename, jsFiles, function (err) { - console.log("Unable to load minified file " + jsFilename + ": " + err.toString()); - /* Throw away error and generate a 404, not 500 */ - next(); - }); -} - -function _handle(req, res, jsFilename, jsFiles, next) { - res.header("Content-Type","text/javascript"); - - var cacheName = CACHE_DIR + "/minified_" + jsFilename.replace(/\//g, "_"); - - //minifying is enabled - if(settings.minify) - { - var result = undefined; - var latestModification = 0; - - async.series([ - //find out the highest modification date - function(callback) - { - var folders2check = [CSS_DIR, JS_DIR]; - - //go trough this two folders - async.forEach(folders2check, function(path, callback) - { - //read the files in the folder - fs.readdir(path, function(err, files) - { - if(ERR(err, callback)) return; - - //we wanna check the directory itself for changes too - files.push("."); - - //go trough all files in this folder - async.forEach(files, function(filename, callback) - { - //get the stat data of this file - fs.stat(path + "/" + filename, function(err, stats) - { - if(ERR(err, callback)) return; - - //get the modification time - var modificationTime = stats.mtime.getTime(); - - //compare the modification time to the highest found - if(modificationTime > latestModification) - { - latestModification = modificationTime; - } - - callback(); - }); - }, callback); - }); - }, callback); - }, - function(callback) - { - //check the modification time of the minified js - fs.stat(cacheName, function(err, stats) - { - if(err && err.code != "ENOENT") - { - ERR(err, callback); - return; - } - - //there is no minfied file or there new changes since this file was generated, so continue generating this file - if((err && err.code == "ENOENT") || stats.mtime.getTime() < latestModification) - { - callback(); - } - //the minified file is still up to date, stop minifying - else - { - callback("stop"); - } - }); - }, - //load all js files - function (callback) - { - var values = []; - tarCode( - jsFiles - , function (content) {values.push(content)} - , function (err) { - if(ERR(err, next)) return; - - result = values.join(''); - callback(); - }); - }, - //put all together and write it into a file - function(callback) - { - async.parallel([ - //write the results plain in a file - function(callback) - { - fs.writeFile(cacheName, result, "utf8", callback); - }, - //write the results compressed in a file - function(callback) - { - zlib.gzip(result, function(err, compressedResult){ - //weird gzip bug that returns 0 instead of null if everything is ok - err = err === 0 ? null : err; - - if(ERR(err, callback)) return; - - fs.writeFile(cacheName + ".gz", compressedResult, callback); - }); - } - ],callback); - } - ], function(err) - { - if(err && err != "stop") - { - if(ERR(err)) return; - } - - //check if gzip is supported by this browser - var gzipSupport = req.header('Accept-Encoding', '').indexOf('gzip') != -1; - - var pathStr; - if(gzipSupport && os.type().indexOf("Windows") == -1) - { - pathStr = path.normalize(cacheName + ".gz"); - res.header('Content-Encoding', 'gzip'); - } - else - { - pathStr = path.normalize(cacheName); - } - - res.sendfile(pathStr, { maxAge: server.maxAge }); - }) - } - //minifying is disabled, so put the files together in one file - else - { - tarCode( - jsFiles - , function (content) {res.write(content)} - , function (err) { - if(ERR(err, next)) return; -======= - var filename = req.params['filename']; - - // No relative paths, especially if they may go up the file hierarchy. - filename = path.normalize(path.join(ROOT_DIR, filename)); - if (filename.indexOf(ROOT_DIR) == 0) { - filename = filename.slice(ROOT_DIR.length); - filename = filename.replace(/\\/g, '/'); // Windows (safe generally?) - } else { - res.writeHead(404, {}); - res.end(); - return; - } - - // What content type should this be? - // TODO: This should use a MIME module. - var contentType; - if (filename.match(/\.js$/)) { - contentType = "text/javascript"; - } else if (filename.match(/\.css$/)) { - contentType = "text/css"; - } else if (filename.match(/\.html$/)) { - contentType = "text/html"; - } else if (filename.match(/\.txt$/)) { - contentType = "text/plain"; - } else if (filename.match(/\.png$/)) { - contentType = "image/png"; - } else if (filename.match(/\.gif$/)) { - contentType = "image/gif"; - } else if (filename.match(/\.ico$/)) { - contentType = "image/x-icon"; - } else { - contentType = "application/octet-stream"; - } - - statFile(filename, function (error, date, exists) { - if (date) { - date = new Date(date); - res.setHeader('last-modified', date.toUTCString()); - res.setHeader('date', (new Date()).toUTCString()); - if (server.maxAge) { - var expiresDate = new Date((new Date()).getTime()+server.maxAge*1000); - res.setHeader('expires', expiresDate.toUTCString()); - res.setHeader('cache-control', 'max-age=' + server.maxAge); - } - } - - if (error) { - res.writeHead(500, {}); ->>>>>>> pita - res.end(); - } else if (!exists) { - res.writeHead(404, {}); - res.end(); - } else if (new Date(req.headers['if-modified-since']) >= date) { - res.writeHead(304, {}); - res.end(); - } else { - if (req.method == 'HEAD') { - res.header("Content-Type", contentType); - res.writeHead(200, {}); - res.end(); - } else if (req.method == 'GET') { - getFileCompressed(filename, contentType, function (error, content) { - if(ERR(error)) return; - res.header("Content-Type", contentType); - res.writeHead(200, {}); - res.write(content); - res.end(); - }); - } else { - res.writeHead(405, {'allow': 'HEAD, GET'}); - res.end(); - } - } - }); -} - -// find all includes in ace.js and embed them. -function getAceFile(callback) { - fs.readFile(ROOT_DIR + 'js/ace.js', "utf8", function(err, data) { - if(ERR(err, callback)) return; - - // Find all includes in ace.js and embed them - var founds = data.match(/\$\$INCLUDE_[a-zA-Z_]+\("[^"]*"\)/gi); - if (!settings.minify) { - founds = []; - } - // Always include the require kernel. - founds.push('$$INCLUDE_JS("../static/js/require-kernel.js")'); - - data += ';\n'; - data += 'Ace2Editor.EMBEDED = Ace2Editor.EMBEDED || {};\n'; - - // Request the contents of the included file on the server-side and write - // them into the file. - async.forEach(founds, function (item, callback) { - var filename = item.match(/"([^"]*)"/)[1]; - var request = require('request'); - - var baseURI = 'http://localhost:' + settings.port - - request(baseURI + path.normalize(path.join('/static/', filename)), function (error, response, body) { - if (!error && response.statusCode == 200) { - data += 'Ace2Editor.EMBEDED[' + JSON.stringify(filename) + '] = ' - + JSON.stringify(body || '') + ';\n'; - } else { - // Silence? - } - callback(); - }); - }, function(error) { - callback(error, data); - }); - }); -} - -// Check for the existance of the file and get the last modification date. -function statFile(filename, callback) { - if (filename == 'js/ace.js') { - // Sometimes static assets are inlined into this file, so we have to stat - // everything. - lastModifiedDateOfEverything(function (error, date) { - callback(error, date, !error); - }); - } else if (filename == 'js/require-kernel.js') { - callback(null, requireLastModified(), true); - } else { - fs.stat(ROOT_DIR + filename, function (error, stats) { - if (error) { - if (error.code == "ENOENT") { - // Stat the directory instead. - fs.stat(path.dirname(ROOT_DIR + filename), function (error, stats) { - if (error) { - if (error.code == "ENOENT") { - callback(null, null, false); - } else { - callback(error); - } - } else { - callback(null, stats.mtime.getTime(), false); - } - }); - } else { - callback(error); - } - } else { - callback(null, stats.mtime.getTime(), true); - } - }); - } -} -function lastModifiedDateOfEverything(callback) { - var folders2check = [ROOT_DIR + 'js/', ROOT_DIR + 'css/']; - var latestModification = 0; - //go trough this two folders - async.forEach(folders2check, function(path, callback) - { - //read the files in the folder - fs.readdir(path, function(err, files) - { - if(ERR(err, callback)) return; - - //we wanna check the directory itself for changes too - files.push("."); - - //go trough all files in this folder - async.forEach(files, function(filename, callback) - { - //get the stat data of this file - fs.stat(path + "/" + filename, function(err, stats) - { - if(ERR(err, callback)) return; - - //get the modification time - var modificationTime = stats.mtime.getTime(); - - //compare the modification time to the highest found - if(modificationTime > latestModification) - { - latestModification = modificationTime; - } - - callback(); - }); - }, callback); - }); - }, function () { - callback(null, latestModification); - }); -} - -// This should be provided by the module, but until then, just use startup -// time. -var _requireLastModified = new Date(); -function requireLastModified() { - return _requireLastModified.toUTCString(); -} -function requireDefinition() { - return 'var require = ' + RequireKernel.kernelSource + ';\n'; -} - -<<<<<<< HEAD -function tarCode(jsFiles, write, callback) { - write('require.define({'); - var initialEntry = true; - async.forEach(jsFiles, function (filename, callback){ - var path; - var srcPath; - if (filename.indexOf('plugins/') == 0) { - srcPath = filename.substring('plugins/'.length); - path = require.resolve(srcPath); - } else { - srcPath = '/' + filename; - path = JS_DIR + filename; - } - - srcPath = JSON.stringify(srcPath); - var srcPathAbbv = JSON.stringify(srcPath.replace(/\.js$/, '')); - - if (filename == 'ace.js') { - getAceFile(handleFile); - } else { - fs.readFile(path, "utf8", handleFile); - } - - function handleFile(err, data) { - if(ERR(err, callback)) return; - - if (!initialEntry) { - write('\n,'); - } else { - initialEntry = false; - } - write(srcPath + ': ') - data = '(function (require, exports, module) {' + data + '})'; -======= -function getFileCompressed(filename, contentType, callback) { - getFile(filename, function (error, content) { - if (error || !content) { - callback(error, content); - } else { ->>>>>>> pita - if (settings.minify) { - if (contentType == 'text/javascript') { - try { - content = compressJS([content]); - } catch (error) { - // silence - } - } else if (contentType == 'text/css') { - content = compressCSS([content]); - } - } - callback(null, content); - } -<<<<<<< HEAD - }, function (err) { - if(ERR(err, callback)) return; - write('});\n'); - callback(); -======= ->>>>>>> pita - }); -} - -function getFile(filename, callback) { - if (filename == 'js/ace.js') { - getAceFile(callback); - } else if (filename == 'js/require-kernel.js') { - callback(undefined, requireDefinition()); - } else { - fs.readFile(ROOT_DIR + filename, callback); - } -} - -function compressJS(values) -{ - var complete = values.join("\n"); - var ast = jsp.parse(complete); // parse code and get the initial AST - ast = pro.ast_mangle(ast); // get a new AST with mangled names - ast = pro.ast_squeeze(ast); // get an AST with compression optimizations - return pro.gen_code(ast); // compressed code here -} - -function compressCSS(values) -{ - var complete = values.join("\n"); - return cleanCSS.process(complete); -} From 6fc45d6252928f1b95171dba716d1c39e5397b28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Bartelme=C3=9F?= Date: Fri, 20 Apr 2012 17:00:32 +0200 Subject: [PATCH 223/297] added etherpad-lite to "bin" in package.json --- src/package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/package.json b/src/package.json index eda385b2..cd9342be 100644 --- a/src/package.json +++ b/src/package.json @@ -31,6 +31,7 @@ "semver" : "1.0.13", "underscore" : "1.3.1" }, + "bin": { "etherpad-lite": "./node/server.js" }, "devDependencies": { "jshint" : "*" }, From 90bbf169b247194946fdbc13c1de700c495372cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Bartelme=C3=9F?= Date: Fri, 20 Apr 2012 17:03:26 +0200 Subject: [PATCH 224/297] allow startup without settings file --- src/node/utils/Settings.js | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/node/utils/Settings.js b/src/node/utils/Settings.js index cb6a6403..8f13b0c6 100644 --- a/src/node/utils/Settings.js +++ b/src/node/utils/Settings.js @@ -106,9 +106,15 @@ if (settingsFilename.charAt(0) != '/') { settingsFilename = path.normalize(path.join(root, settingsFilename)); } -//read the settings sync -var settingsStr = fs.readFileSync(settingsFilename).toString(); - +var settingsStr +try{ + //read the settings sync + settingsStr = fs.readFileSync(settingsFilename).toString(); +} catch(e){ + console.warn('No settings file found. Using defaults.'); + settingsStr = '{}'; +} + //remove all comments settingsStr = settingsStr.replace(/\*([^*]|[\r\n]|(\*+([^*/]|[\r\n])))*\*+/gm,"").replace(/#.*/g,"").replace(/\/\/.*/g,""); From e9fc16a9745c83e084a01bcdf8a3c0025154559f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Bartelme=C3=9F?= Date: Fri, 20 Apr 2012 17:03:37 +0200 Subject: [PATCH 225/297] warn if dirty db is used --- src/node/utils/Settings.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/node/utils/Settings.js b/src/node/utils/Settings.js index 8f13b0c6..7c64140b 100644 --- a/src/node/utils/Settings.js +++ b/src/node/utils/Settings.js @@ -152,3 +152,7 @@ for(var i in settings) console.warn("This setting doesn't exist or it was removed"); } } + +if(exports.dbType === "dirty"){ + console.warn("DirtyDB is used. This is fine for testing but not recommended for production.") +} From c90ef5aeb8a83d58daff38d79de92919fde96b0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Bartelme=C3=9F?= Date: Fri, 20 Apr 2012 22:39:16 +0200 Subject: [PATCH 226/297] default dirty.db to current pwd, so no new directory has to be created --- src/node/utils/Settings.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/node/utils/Settings.js b/src/node/utils/Settings.js index 7c64140b..e60446df 100644 --- a/src/node/utils/Settings.js +++ b/src/node/utils/Settings.js @@ -44,7 +44,7 @@ exports.dbType = "dirty"; /** * This setting is passed with dbType to ueberDB to set up the database */ -exports.dbSettings = { "filename" : path.join(exports.root, "var/dirty.db") }; +exports.dbSettings = { "filename" : path.join(exports.root, "dirty.db") }; /** * The default Text of a new pad */ From 7f50e8f55106ca455e2897639454c31578bdb164 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Bartelme=C3=9F?= Date: Fri, 20 Apr 2012 22:40:33 +0200 Subject: [PATCH 227/297] server.js can be called from console. --- src/node/server.js | 1 + 1 file changed, 1 insertion(+) mode change 100644 => 100755 src/node/server.js diff --git a/src/node/server.js b/src/node/server.js old mode 100644 new mode 100755 index 9d2c52e4..978c83fb --- a/src/node/server.js +++ b/src/node/server.js @@ -1,3 +1,4 @@ +#!/usr/bin/env node /** * This module is started with bin/run.sh. It sets up a Express HTTP and a Socket.IO Server. * Static file Requests are answered directly from this module, Socket.IO messages are passed From 8fefb551fca91212b2419ab0cd593b460f8f7397 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Bartelme=C3=9F?= Date: Fri, 20 Apr 2012 22:44:10 +0200 Subject: [PATCH 228/297] less verbose startup, better log messages at startup --- src/node/server.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/node/server.js b/src/node/server.js index 978c83fb..4eb38ea7 100755 --- a/src/node/server.js +++ b/src/node/server.js @@ -66,9 +66,9 @@ async.waterfall([ plugins.update, function (callback) { - console.log("Installed plugins: " + plugins.formatPlugins()); - console.log("Installed parts:\n" + plugins.formatParts()); - console.log("Installed hooks:\n" + plugins.formatHooks()); + console.info("Installed plugins: " + plugins.formatPlugins()); + console.debug("Installed parts:\n" + plugins.formatParts()); + console.debug("Installed hooks:\n" + plugins.formatHooks()); callback(); }, @@ -89,12 +89,12 @@ async.waterfall([ //let the server listen app.listen(settings.port, settings.ip); - console.log("Server is listening at " + settings.ip + ":" + settings.port); + console.log("You can access your Etherpad-Lite instance at http://" + settings.ip + ":" + settings.port + "/"); if(!_.isEmpty(settings.users)){ - console.log("Plugin admin page listening at " + settings.ip + ":" + settings.port + "/admin/plugins"); + console.log("The plugin admin page is at http://" + settings.ip + ":" + settings.port + "/admin/plugins"); } else{ - console.log("Admin username and password not set in settings.json. To access admin please uncomment and edit 'users' in settings.json"); + console.warn("Admin username and password not set in settings.json. To access admin please uncomment and edit 'users' in settings.json"); } callback(null); } From 16edda7d46ffbe277d505e71f54cda1da2f00452 Mon Sep 17 00:00:00 2001 From: John McLear Date: Sat, 21 Apr 2012 00:16:10 +0200 Subject: [PATCH 229/297] luke warm fix. --- src/package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/package.json b/src/package.json index eda385b2..16076e1d 100644 --- a/src/package.json +++ b/src/package.json @@ -29,7 +29,8 @@ "graceful-fs" : "1.1.5", "slide" : "1.1.3", "semver" : "1.0.13", - "underscore" : "1.3.1" + "underscore" : "1.3.1", + "resolve" : "0.2.1" }, "devDependencies": { "jshint" : "*" From d08f3ff5ee5bf688131d1b40694eedb718e3d2c8 Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Sat, 21 Apr 2012 01:17:27 +0200 Subject: [PATCH 230/297] Bugfix dependencies --- src/package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/package.json b/src/package.json index eda385b2..ac56bc35 100644 --- a/src/package.json +++ b/src/package.json @@ -13,6 +13,7 @@ "yajsml" : "1.1.2", "request" : "2.9.100", "require-kernel" : "1.0.5", + "resolve" : "0.2.1", "socket.io" : "0.8.7", "ueberDB" : "0.1.7", "async" : "0.1.18", From d554420f573af28d91f036f56950fe031d330bb9 Mon Sep 17 00:00:00 2001 From: John McLear Date: Sat, 21 Apr 2012 01:23:13 +0200 Subject: [PATCH 231/297] Remove my fix and allow @redhogs to be the proper one.. (even though it's exactly the same thing) --- src/package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/package.json b/src/package.json index 19725e7d..ac56bc35 100644 --- a/src/package.json +++ b/src/package.json @@ -30,8 +30,7 @@ "graceful-fs" : "1.1.5", "slide" : "1.1.3", "semver" : "1.0.13", - "underscore" : "1.3.1", - "resolve" : "0.2.1" + "underscore" : "1.3.1" }, "devDependencies": { "jshint" : "*" From a557f2414e4abf606dcbeba12cf3187f9e625646 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Bartelme=C3=9F?= Date: Sat, 21 Apr 2012 13:47:11 +0200 Subject: [PATCH 232/297] cssManager top is not used, so drop it --- src/static/js/ace2_inner.js | 8 -------- src/static/js/cssmanager.js | 11 ++++------- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/src/static/js/ace2_inner.js b/src/static/js/ace2_inner.js index 0e15195c..723d410f 100644 --- a/src/static/js/ace2_inner.js +++ b/src/static/js/ace2_inner.js @@ -166,12 +166,10 @@ function Ace2Inner(){ } var dynamicCSS = null; - var dynamicCSSTop = null; function initDynamicCSS() { dynamicCSS = makeCSSManager("dynamicsyntax"); - dynamicCSSTop = makeCSSManager("dynamicsyntax", true); } var changesetTracker = makeChangesetTracker(scheduler, rep.apool, { @@ -214,7 +212,6 @@ function Ace2Inner(){ if (dynamicCSS) { dynamicCSS.removeSelectorStyle(getAuthorColorClassSelector(getAuthorClassName(author))); - dynamicCSSTop.removeSelectorStyle(getAuthorColorClassSelector(getAuthorClassName(author))); } } else @@ -232,23 +229,18 @@ function Ace2Inner(){ var authorStyle = dynamicCSS.selectorStyle(getAuthorColorClassSelector( getAuthorClassName(author))); - var authorStyleTop = dynamicCSSTop.selectorStyle(getAuthorColorClassSelector( - getAuthorClassName(author))); var anchorStyle = dynamicCSS.selectorStyle(getAuthorColorClassSelector( getAuthorClassName(author))+' > a') // author color authorStyle.backgroundColor = bgcolor; - authorStyleTop.backgroundColor = bgcolor; // text contrast if(colorutils.luminosity(colorutils.css2triple(bgcolor)) < 0.5) { authorStyle.color = '#ffffff'; - authorStyleTop.color = '#ffffff'; }else{ authorStyle.color = null; - authorStyleTop.color = null; } // anchor text contrast diff --git a/src/static/js/cssmanager.js b/src/static/js/cssmanager.js index 952388b7..e2007449 100644 --- a/src/static/js/cssmanager.js +++ b/src/static/js/cssmanager.js @@ -20,15 +20,12 @@ * limitations under the License. */ -function makeCSSManager(emptyStylesheetTitle, top) +function makeCSSManager(emptyStylesheetTitle) { - function getSheetByTitle(title, top) + function getSheetByTitle(title) { - if(top) - var allSheets = window.parent.parent.document.styleSheets; - else - var allSheets = document.styleSheets; + var allSheets = document.styleSheets; for (var i = 0; i < allSheets.length; i++) { @@ -41,7 +38,7 @@ function makeCSSManager(emptyStylesheetTitle, top) return null; } - var browserSheet = getSheetByTitle(emptyStylesheetTitle, top); + var browserSheet = getSheetByTitle(emptyStylesheetTitle); function browserRules() { From 18d0c8118103b8fb50203c5f40d7aa97e249d9d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Bartelme=C3=9F?= Date: Sat, 21 Apr 2012 14:57:22 +0200 Subject: [PATCH 233/297] adding padutils to padmodals --- src/static/js/pad_modals.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/static/js/pad_modals.js b/src/static/js/pad_modals.js index 480074c5..2e1939fc 100644 --- a/src/static/js/pad_modals.js +++ b/src/static/js/pad_modals.js @@ -19,6 +19,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + +var padutils = require('./pad_utils').padutils; var padmodals = (function() { From 513deef76880e3b59ad9bcbaf9cdd7c5dfb036c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Bartelme=C3=9F?= Date: Wed, 25 Apr 2012 10:23:58 +0200 Subject: [PATCH 234/297] added baseURL export to pad.js, timeslider.js, plugins.js, fixing #670 --- src/static/js/pad.js | 5 +++-- src/static/js/pluginfw/plugins.js | 3 ++- src/static/js/timeslider.js | 5 +++-- src/templates/pad.html | 12 +++++++++--- src/templates/timeslider.html | 24 ++++++++++++++++-------- 5 files changed, 33 insertions(+), 16 deletions(-) diff --git a/src/static/js/pad.js b/src/static/js/pad.js index 3a1c1633..9db1c5b9 100644 --- a/src/static/js/pad.js +++ b/src/static/js/pad.js @@ -203,7 +203,8 @@ function handshake() //create the url var url = loc.protocol + "//" + loc.hostname + ":" + port + "/"; //find out in which subfolder we are - var resource = loc.pathname.substr(1, loc.pathname.indexOf("/p/")) + "socket.io"; + var resource = exports.baseURL + "socket.io"; + //connect socket = pad.socket = io.connect(url, { resource: resource, @@ -1029,7 +1030,7 @@ var settings = { }; pad.settings = settings; - +exports.baseURL = ''; exports.settings = settings; exports.createCookie = createCookie; exports.readCookie = readCookie; diff --git a/src/static/js/pluginfw/plugins.js b/src/static/js/pluginfw/plugins.js index a3a8a8df..1f66da41 100644 --- a/src/static/js/pluginfw/plugins.js +++ b/src/static/js/pluginfw/plugins.js @@ -24,6 +24,7 @@ exports.loaded = false; exports.plugins = {}; exports.parts = []; exports.hooks = {}; +exports.baseURL = ''; exports.ensure = function (cb) { if (!exports.loaded) @@ -103,7 +104,7 @@ if (exports.isClient) { // which appears to fix the issue. var callback = function () {setTimeout(cb, 0);}; - jQuery.getJSON('../pluginfw/plugin-definitions.json', function(data) { + jQuery.getJSON(exports.baseURL + 'pluginfw/plugin-definitions.json', function(data) { exports.plugins = data.plugins; exports.parts = data.parts; exports.hooks = exports.extractHooks(exports.parts, "client_hooks"); diff --git a/src/static/js/timeslider.js b/src/static/js/timeslider.js index 438b1695..6c91423b 100644 --- a/src/static/js/timeslider.js +++ b/src/static/js/timeslider.js @@ -60,8 +60,8 @@ function init() { //create the url var url = loc.protocol + "//" + loc.hostname + ":" + port + "/"; //find out in which subfolder we are - var resource = loc.pathname.substr(1,loc.pathname.indexOf("/p/")) + "socket.io"; - + var resource = exports.baseURL + 'socket.io'; + //build up the socket io connection socket = io.connect(url, {resource: resource}); @@ -153,4 +153,5 @@ function handleClientVars(message) } } +exports.baseURL = ''; exports.init = init; diff --git a/src/templates/pad.html b/src/templates/pad.html index 6181b062..3eced909 100644 --- a/src/templates/pad.html +++ b/src/templates/pad.html @@ -279,13 +279,19 @@ document.domain = document.domain; var clientVars = {}; (function () { - require.setRootURI("../javascripts/src"); - require.setLibraryURI("../javascripts/lib"); + + var baseURL = '../'; + + require.setRootURI(baseURL + "javascripts/src"); + require.setLibraryURI(baseURL + "javascripts/lib"); require.setGlobalKeyPath("require"); var plugins = require('ep_etherpad-lite/static/js/pluginfw/plugins'); + plugins.baseURL = baseURL; plugins.update(function () { - require('ep_etherpad-lite/static/js/pad').init(); + var pad = require('ep_etherpad-lite/static/js/pad'); + pad.baseURL = baseURL; + pad.init(); }); /* TODO: These globals shouldn't exist. */ diff --git a/src/templates/timeslider.html b/src/templates/timeslider.html index ca4bc6e9..5db11b8f 100644 --- a/src/templates/timeslider.html +++ b/src/templates/timeslider.html @@ -123,22 +123,30 @@

- - - - - + + + + + + - - + + + +
@@ -20,7 +20,7 @@

Etherpad Lite

-
+

Installed plugins

@@ -44,7 +44,7 @@
-
+

Search for plugins to install

From 4b272fe2e1824665d4772db2b28e75995c3bb0ec Mon Sep 17 00:00:00 2001 From: 0ip Date: Sun, 29 Apr 2012 01:00:31 +0200 Subject: [PATCH 236/297] Tidied up highlighting for currently opened module --- src/static/css/pad.css | 2 +- src/static/js/pad_editbar.js | 19 ++++++++----------- src/templates/pad.html | 2 +- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/src/static/css/pad.css b/src/static/css/pad.css index 2ce8dbb6..31d74c87 100644 --- a/src/static/css/pad.css +++ b/src/static/css/pad.css @@ -1402,7 +1402,7 @@ input[type=checkbox] { float: left; width: 50%; } -#settingsmenu, +#settings, #importexport, #embed { position: absolute; diff --git a/src/static/js/pad_editbar.js b/src/static/js/pad_editbar.js index dec32b46..cede9f37 100644 --- a/src/static/js/pad_editbar.js +++ b/src/static/js/pad_editbar.js @@ -119,7 +119,7 @@ var padeditbar = (function() } else if (cmd == 'settings') { - self.toogleDropDown("settingsmenu"); + self.toogleDropDown("settings"); } else if (cmd == 'embed') { @@ -177,12 +177,11 @@ var padeditbar = (function() }, toogleDropDown: function(moduleName) { - var modules = ["settingsmenu", "importexport", "embed", "users"]; + var modules = ["settings", "importexport", "embed", "users"]; - //hide all modules + // hide all modules and remove highlighting of all buttons if(moduleName == "none") { - $(".toolbar ul.menu_right li").removeClass("selected"); for(var i=0;i 0 && nth_child <= (modules.length-1)) { - $(".toolbar ul.menu_right li:not(:nth-child(" + nth_child + "))").removeClass("selected"); - $(".toolbar ul.menu_right li:nth-child(" + nth_child + ")").toggleClass("selected"); - } - if(modules[modules.length-1] === moduleName) $(".toolbar ul.menu_right li").removeClass("selected"); - //hide all modules that are not selected and show the selected one + // hide all modules that are not selected and remove highlighting + // respectively add highlighting to the corresponding button for(var i=0;iLoading...
-