aboutsummaryrefslogtreecommitdiff
path: root/node_modules/montage/core/core.js
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-06-20 16:48:34 -0700
committerJose Antonio Marquez2012-06-20 16:48:34 -0700
commit4eff115126ab946c5852d787fd596e07b156c9a5 (patch)
treef7d45b260f2fb5ba5dc4d1879076ca032d5ae2e6 /node_modules/montage/core/core.js
parent7615da5c6ba54bd082eac4b8a6d9196084e5c590 (diff)
parent392a559e90357d48c910a07617261483b2b45476 (diff)
downloadninja-4eff115126ab946c5852d787fd596e07b156c9a5.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into Color
Diffstat (limited to 'node_modules/montage/core/core.js')
-rwxr-xr-xnode_modules/montage/core/core.js14
1 files changed, 1 insertions, 13 deletions
diff --git a/node_modules/montage/core/core.js b/node_modules/montage/core/core.js
index 26733c94..9109b772 100755
--- a/node_modules/montage/core/core.js
+++ b/node_modules/montage/core/core.js
@@ -635,16 +635,4 @@ Object.defineProperty(Montage, "callDelegateMethod", {
635 return delegateFunction.apply(delegate, arguments); 635 return delegateFunction.apply(delegate, arguments);
636 } 636 }
637 } 637 }
638}); 638}); \ No newline at end of file
639
640// XXX Does not presently function server-side
641if (typeof window !== "undefined") {
642
643 var EventManager = require("core/event/event-manager").EventManager;
644 EventManager.create().initWithWindow(window);
645
646 // Now that we have a defaultEventManager we can setup the bindings system
647 require("core/event/binding");
648
649}
650