aboutsummaryrefslogtreecommitdiff
path: root/js/ninja.reel/ninja.js
diff options
context:
space:
mode:
authorValerio Virgillito2012-03-06 11:05:00 -0800
committerValerio Virgillito2012-03-06 11:05:00 -0800
commit4540b5b4ea2065c3e0d67b46bba8b6764801fbea (patch)
tree4e1561530b1b90ea497bac8e41d193fa605e98b4 /js/ninja.reel/ninja.js
parent4e35725e6c9044c37bef28b8c8d36f4b5c89bfd9 (diff)
parent84332ab81c1b445195f1d9be8bbeae0725c8e758 (diff)
downloadninja-4540b5b4ea2065c3e0d67b46bba8b6764801fbea.tar.gz
Merge branch 'refs/heads/master' into panels
Diffstat (limited to 'js/ninja.reel/ninja.js')
-rwxr-xr-xjs/ninja.reel/ninja.js30
1 files changed, 3 insertions, 27 deletions
diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js
index 6efeef8a..88361fd9 100755
--- a/js/ninja.reel/ninja.js
+++ b/js/ninja.reel/ninja.js
@@ -8,10 +8,9 @@ var Montage = require("montage/core/core").Montage,
8 Component = require("montage/ui/component").Component, 8 Component = require("montage/ui/component").Component,
9 AppData = require("js/data/appdata").AppData; 9 AppData = require("js/data/appdata").AppData;
10 10
11exports.Ninja = Montage.create(Component, { 11var matrix = require("js/lib/math/matrix");
12 12
13 _appLoaded: { value: false }, 13exports.Ninja = Montage.create(Component, {
14 _preload: { value: false },
15 14
16 ninjaVersion: { 15 ninjaVersion: {
17 value: null 16 value: null
@@ -54,7 +53,7 @@ exports.Ninja = Montage.create(Component, {
54 53
55 window.addEventListener("resize", this, false); 54 window.addEventListener("resize", this, false);
56 55
57 this.eventManager.addEventListener( "appLoading", this, false); 56// this.eventManager.addEventListener( "appLoading", this, false); // Don't need this anymore
58 this.eventManager.addEventListener( "selectTool", this, false); 57 this.eventManager.addEventListener( "selectTool", this, false);
59 this.eventManager.addEventListener( "selectSubTool", this, false); 58 this.eventManager.addEventListener( "selectSubTool", this, false);
60 this.eventManager.addEventListener( "onOpenDocument", this, false); 59 this.eventManager.addEventListener( "onOpenDocument", this, false);
@@ -79,29 +78,6 @@ exports.Ninja = Montage.create(Component, {
79 } 78 }
80 }, 79 },
81 80
82 handlePreloadFinish: {
83 value: function(e) {
84 this._preload = true;
85 this.appLoaded();
86 }
87 },
88
89 handleAppLoading: {
90 value: function(e) {
91 this._appLoaded = true;
92 this.appLoaded();
93 }
94 },
95
96 appLoaded: {
97 value: function() {
98 if(this._appLoaded && this._preload) {
99 // App is now deserialized and files are preloaded
100 this.appModel.materials = MaterialsLibrary.materials;
101 }
102 }
103 },
104
105 _didDraw: { 81 _didDraw: {
106 value: false 82 value: false
107 }, 83 },