diff options
author | Kruti Shah | 2012-06-20 15:12:48 -0700 |
---|---|---|
committer | Kruti Shah | 2012-06-20 15:12:48 -0700 |
commit | 1fe1202ba87d6de9b0f0d8efee78f955c5350210 (patch) | |
tree | 26ff4c6c5a94accfd5801f124244d3eef152a5c7 /node_modules/montage/core/core.js | |
parent | 1ce4bd7033a413c7697888e5712f278219d6d095 (diff) | |
parent | 782b66c783df4a9c36fa240cc77900e69b9130cf (diff) | |
download | ninja-1fe1202ba87d6de9b0f0d8efee78f955c5350210.tar.gz |
Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti
Diffstat (limited to 'node_modules/montage/core/core.js')
-rwxr-xr-x | node_modules/montage/core/core.js | 14 |
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 | ||
641 | if (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 | |||