diff options
author | Jose Antonio Marquez | 2012-02-02 18:00:45 -0800 |
---|---|---|
committer | Jose Antonio Marquez | 2012-02-02 18:00:45 -0800 |
commit | 04d89daed90c35a4393773ca2e2d0ac3a4c15cd4 (patch) | |
tree | d0041abc7379ef38b20cce148e5dea6f531b8569 /js/ninja.reel/ninja.js | |
parent | 4d8306b638c53899403a4f0328c02bf1ab893e8f (diff) | |
parent | c630ead20487c3948fa36448d3e7d5f7b5cba782 (diff) | |
download | ninja-04d89daed90c35a4393773ca2e2d0ac3a4c15cd4.tar.gz |
Merge branch 'refs/heads/NinjaInternal' into FileIO
Conflicts:
.gitignore
js/ninja.reel/ninja.js
Diffstat (limited to 'js/ninja.reel/ninja.js')
-rwxr-xr-x | js/ninja.reel/ninja.js | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js index 38bc22fb..90015f5a 100755 --- a/js/ninja.reel/ninja.js +++ b/js/ninja.reel/ninja.js | |||
@@ -94,12 +94,15 @@ exports.Ninja = Montage.create(Component, { | |||
94 | } | 94 | } |
95 | }, | 95 | }, |
96 | 96 | ||
97 | _didDraw: { | ||
98 | value: false | ||
99 | }, | ||
100 | |||
97 | didDraw: { | 101 | didDraw: { |
98 | value: function() { | 102 | value: function() { |
99 | NJevent("appLoaded"); | 103 | if(!this._didDraw) { |
100 | // | 104 | NJevent("appLoaded"); |
101 | if (!this.application.ninja.coreIoApi.ioServiceDetected) { | 105 | this._didDraw = true; |
102 | var check = this.application.ninja.coreIoApi.cloudAvailable(); | ||
103 | } | 106 | } |
104 | } | 107 | } |
105 | }, | 108 | }, |
@@ -167,12 +170,6 @@ exports.Ninja = Montage.create(Component, { | |||
167 | } | 170 | } |
168 | }, | 171 | }, |
169 | 172 | ||
170 | handleLivePreview: { | ||
171 | value: function(event) { | ||
172 | |||
173 | } | ||
174 | }, | ||
175 | |||
176 | executeLivePreview: { | 173 | executeLivePreview: { |
177 | value: function() { | 174 | value: function() { |
178 | var background, overflow, transitionStopRule; | 175 | var background, overflow, transitionStopRule; |