aboutsummaryrefslogtreecommitdiff
path: root/js/ninja.reel
diff options
context:
space:
mode:
authorEric Guzman2012-04-04 11:42:23 -0700
committerEric Guzman2012-04-04 11:42:23 -0700
commitc394a1cf04bbf3b9ad3003ec86498a30d00926bb (patch)
tree52c2b672734d4112f101ec3c8e8e2a61f18ebd4f /js/ninja.reel
parent2a5374af0b06e0402498b61985fd3c67d063729b (diff)
parenta11ef2eed7049835c8bdfa50a2b893632c46eaa0 (diff)
downloadninja-c394a1cf04bbf3b9ad3003ec86498a30d00926bb.tar.gz
Merge branch 'refs/heads/master' into CSSPanelUpdates
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 ca094936..9cbbc9b9 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");
@@ -121,7 +122,7 @@ exports.Ninja = Montage.create(Component, {
121 templateDidLoad: { 122 templateDidLoad: {
122 value: function() { 123 value: function() {
123 this.ninjaVersion = window.ninjaVersion.ninja.version; 124 this.ninjaVersion = window.ninjaVersion.ninja.version;
124 this.eventManager.addEventListener( "preloadFinish", this, false); 125 this.undoManager = document.application.undoManager = UndoManager.create();
125 } 126 }
126 }, 127 },
127 128
@@ -140,7 +141,6 @@ exports.Ninja = Montage.create(Component, {
140 141
141 window.addEventListener("resize", this, false); 142 window.addEventListener("resize", this, false);
142 143
143// this.eventManager.addEventListener( "appLoading", this, false); // Don't need this anymore
144 this.eventManager.addEventListener( "selectTool", this, false); 144 this.eventManager.addEventListener( "selectTool", this, false);
145 this.eventManager.addEventListener( "selectSubTool", this, false); 145 this.eventManager.addEventListener( "selectSubTool", this, false);
146 this.eventManager.addEventListener( "onOpenDocument", this, false); 146 this.eventManager.addEventListener( "onOpenDocument", this, false);