aboutsummaryrefslogtreecommitdiffstats
path: root/trunk/infrastructure/framework-src
diff options
context:
space:
mode:
authorEgil Moeller <egil.moller@freecode.no>2010-03-12 21:41:45 +0100
committerEgil Moeller <egil.moller@freecode.no>2010-03-12 21:41:45 +0100
commit24680e64cedb9e3f161fbf7c3fd59ced6e16808f (patch)
treeca83cfefda70b72e79d2a74c153f7e45ee30e3a0 /trunk/infrastructure/framework-src
parentc1894c8e0a52f4e3d2f89fa92f0066bbf0fcf1b1 (diff)
downloadetherpad-24680e64cedb9e3f161fbf7c3fd59ced6e16808f.tar.gz
etherpad-24680e64cedb9e3f161fbf7c3fd59ced6e16808f.tar.xz
etherpad-24680e64cedb9e3f161fbf7c3fd59ced6e16808f.zip
Got plugins and hooks to work
Diffstat (limited to 'trunk/infrastructure/framework-src')
-rw-r--r--trunk/infrastructure/framework-src/modules/execution.js5
1 files changed, 4 insertions, 1 deletions
diff --git a/trunk/infrastructure/framework-src/modules/execution.js b/trunk/infrastructure/framework-src/modules/execution.js
index 1cec418..2f9d933 100644
--- a/trunk/infrastructure/framework-src/modules/execution.js
+++ b/trunk/infrastructure/framework-src/modules/execution.js
@@ -44,8 +44,11 @@ function fancyAssEval(initCode, mainCode) {
1);
}
var runner = Packages.net.appjet.oui.ScopeReuseManager.getEmpty(scalaF1(init));
+ var requestWrapper = null;
+ if (request.underlying !== undefined)
+ requestWrapper = new Packages.net.appjet.oui.RequestWrapper(request.underlying);
var ec = new Packages.net.appjet.oui.ExecutionContext(
- new Packages.net.appjet.oui.RequestWrapper(request.underlying),
+ requestWrapper,
null, runner);
return Packages.net.appjet.oui.ExecutionContextUtils.withContext(ec,
scalaF0(function() {