aboutsummaryrefslogtreecommitdiff
path: root/js/ninja.reel
diff options
context:
space:
mode:
authorArmen Kesablyan2012-04-04 11:34:19 -0700
committerArmen Kesablyan2012-04-04 11:34:19 -0700
commit211f514882144de8df69ebb2106f3b446be1dda0 (patch)
treec8eaf3d9fc7ac1bc841320e73d41818fbfb5827d /js/ninja.reel
parent5a5d0f68dd82b829405a0b301dd11b4cf385c8d5 (diff)
parenta11ef2eed7049835c8bdfa50a2b893632c46eaa0 (diff)
downloadninja-211f514882144de8df69ebb2106f3b446be1dda0.tar.gz
Merge branch 'refs/heads/master' into BugFixes
Diffstat (limited to 'js/ninja.reel')
-rwxr-xr-xjs/ninja.reel/ninja.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js
index 068a44bc..9b5081dd 100755
--- a/js/ninja.reel/ninja.js
+++ b/js/ninja.reel/ninja.js
@@ -6,6 +6,7 @@
6 6
7var Montage = require("montage/core/core").Montage, 7var Montage = require("montage/core/core").Montage,
8 Component = require("montage/ui/component").Component, 8 Component = require("montage/ui/component").Component,
9 UndoManager = require("montage/core/undo-manager").UndoManager,
9 AppData = require("js/data/appdata").AppData; 10 AppData = require("js/data/appdata").AppData;
10 11
11var matrix = require("js/lib/math/matrix"); 12var matrix = require("js/lib/math/matrix");
@@ -141,7 +142,7 @@ exports.Ninja = Montage.create(Component, {
141 templateDidLoad: { 142 templateDidLoad: {
142 value: function() { 143 value: function() {
143 this.ninjaVersion = window.ninjaVersion.ninja.version; 144 this.ninjaVersion = window.ninjaVersion.ninja.version;
144 this.eventManager.addEventListener( "preloadFinish", this, false); 145 this.undoManager = document.application.undoManager = UndoManager.create();
145 } 146 }
146 }, 147 },
147 148
@@ -160,7 +161,6 @@ exports.Ninja = Montage.create(Component, {
160 161
161 window.addEventListener("resize", this, false); 162 window.addEventListener("resize", this, false);
162 163
163// this.eventManager.addEventListener( "appLoading", this, false); // Don't need this anymore
164 this.eventManager.addEventListener( "selectTool", this, false); 164 this.eventManager.addEventListener( "selectTool", this, false);
165 this.eventManager.addEventListener( "selectSubTool", this, false); 165 this.eventManager.addEventListener( "selectSubTool", this, false);
166 this.eventManager.addEventListener( "onOpenDocument", this, false); 166 this.eventManager.addEventListener( "onOpenDocument", this, false);