summaryrefslogtreecommitdiff
path: root/available_plugins
diff options
context:
space:
mode:
authorEgil Moeller <egil.moller@freecode.no>2012-02-26 00:45:06 +0100
committerEgil Moeller <egil.moller@freecode.no>2012-02-26 00:45:06 +0100
commit2a58a62dcc95185983f74f8946f800f32c04ef24 (patch)
treef8704c6889926912ea1d9ced0aaeafbd78661c97 /available_plugins
parent261bbd460feba2dce6ecab9ea06b98d42eceeb93 (diff)
downloadetherpad-lite-2a58a62dcc95185983f74f8946f800f32c04ef24.zip
Client side / server side require
Diffstat (limited to 'available_plugins')
-rw-r--r--available_plugins/pluginomatic_fintest/otherpart.js3
-rw-r--r--available_plugins/pluginomatic_fintest/package.json2
-rw-r--r--available_plugins/pluginomatic_fintest/pluginomatic.json2
-rw-r--r--available_plugins/pluginomatic_fintest/static/js/test.js1
4 files changed, 6 insertions, 2 deletions
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("<em>Abra cadabra</em>");
});
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) <egil.moller@freecode.no>",
"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;