diff options
author | hwc487 | 2012-03-06 16:03:26 -0800 |
---|---|---|
committer | hwc487 | 2012-03-06 16:03:26 -0800 |
commit | 855e8727b147771ff7b05e71bed481e65fe4b6b0 (patch) | |
tree | 60d7f091fcf0870495aeaa63748492dbd558619d /js/ninja.reel/ninja.js | |
parent | 1207735f05f202b5bdc5f70c73445f8e0934a227 (diff) | |
parent | 4f498b43264327f5886e0370bd3536453d47570a (diff) | |
download | ninja-855e8727b147771ff7b05e71bed481e65fe4b6b0.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into integration
Conflicts:
js/preloader/Preloader.js
Diffstat (limited to 'js/ninja.reel/ninja.js')
-rwxr-xr-x | js/ninja.reel/ninja.js | 30 |
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 | ||
11 | exports.Ninja = Montage.create(Component, { | 11 | var matrix = require("js/lib/math/matrix"); |
12 | 12 | ||
13 | _appLoaded: { value: false }, | 13 | exports.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 | }, |