aboutsummaryrefslogtreecommitdiff
path: root/js/ninja.reel/ninja.js
diff options
context:
space:
mode:
authorArmen Kesablyan2012-02-07 16:55:34 -0800
committerArmen Kesablyan2012-02-07 16:55:34 -0800
commit10f0ad4c15f090b2d0d50d11e4c7aaf291e9eb0e (patch)
tree12b31910a3c7c7fa2ee0b26d8aaa611710e139a5 /js/ninja.reel/ninja.js
parent7f8730c3add146f1ba107e6fc22d1f5a8348ed8b (diff)
parent668510892537eaaeb2e11520831d87b44b2489b7 (diff)
downloadninja-10f0ad4c15f090b2d0d50d11e4c7aaf291e9eb0e.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into text-tool
Conflicts: _scss/compass_app_log.txt css/ninja.css
Diffstat (limited to 'js/ninja.reel/ninja.js')
-rw-r--r--js/ninja.reel/ninja.js20
1 files changed, 13 insertions, 7 deletions
diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js
index bc31e0e1..90015f5a 100644
--- a/js/ninja.reel/ninja.js
+++ b/js/ninja.reel/ninja.js
@@ -13,6 +13,10 @@ exports.Ninja = Montage.create(Component, {
13 _appLoaded: { value: false }, 13 _appLoaded: { value: false },
14 _preload: { value: false }, 14 _preload: { value: false },
15 15
16 ninjaVersion: {
17 value: window.ninjaVersion.ninja.version
18 },
19
16 toolsData: { value: null }, 20 toolsData: { value: null },
17 appData: { value: AppData }, 21 appData: { value: AppData },
18 22
@@ -36,6 +40,7 @@ exports.Ninja = Montage.create(Component, {
36 40
37 prepareForDraw: { 41 prepareForDraw: {
38 value: function() { 42 value: function() {
43 console.log("Loading Ninja --> ", this.ninjaVersion);
39 44
40 this.application.ninja = this; 45 this.application.ninja = this;
41 46
@@ -89,9 +94,16 @@ exports.Ninja = Montage.create(Component, {
89 } 94 }
90 }, 95 },
91 96
97 _didDraw: {
98 value: false
99 },
100
92 didDraw: { 101 didDraw: {
93 value: function() { 102 value: function() {
94 NJevent("appLoaded"); 103 if(!this._didDraw) {
104 NJevent("appLoaded");
105 this._didDraw = true;
106 }
95 } 107 }
96 }, 108 },
97 109
@@ -158,12 +170,6 @@ exports.Ninja = Montage.create(Component, {
158 } 170 }
159 }, 171 },
160 172
161 handleLivePreview: {
162 value: function(event) {
163
164 }
165 },
166
167 executeLivePreview: { 173 executeLivePreview: {
168 value: function() { 174 value: function() {
169 var background, overflow, transitionStopRule; 175 var background, overflow, transitionStopRule;