diff options
author | Jose Antonio Marquez | 2012-02-15 20:37:48 -0800 |
---|---|---|
committer | Jose Antonio Marquez | 2012-02-15 20:37:48 -0800 |
commit | 89b5e793ea88ef235b54b6e1d1c379698d3e612b (patch) | |
tree | 4d29118f35df77ca6b423119a4ff61694a442cbf /js/ninja.reel/ninja.js | |
parent | 9d2c2a80483415d7560b00cda5519153db23e241 (diff) | |
parent | d366c0bd1af6471511217ed574083e15059519b5 (diff) | |
download | ninja-89b5e793ea88ef235b54b6e1d1c379698d3e612b.tar.gz |
Merge branch 'refs/heads/NinjaInternal' into Color
Diffstat (limited to 'js/ninja.reel/ninja.js')
-rwxr-xr-x[-rw-r--r--] | js/ninja.reel/ninja.js | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js index 469d38f7..43087c39 100644..100755 --- a/js/ninja.reel/ninja.js +++ b/js/ninja.reel/ninja.js | |||
@@ -102,6 +102,9 @@ exports.Ninja = Montage.create(Component, { | |||
102 | didDraw: { | 102 | didDraw: { |
103 | value: function() { | 103 | value: function() { |
104 | if(!this._didDraw) { | 104 | if(!this._didDraw) { |
105 | if (!this.application.ninja.coreIoApi.ioServiceDetected) { | ||
106 | var check = this.application.ninja.coreIoApi.cloudAvailable(); | ||
107 | } | ||
105 | NJevent("appLoaded"); | 108 | NJevent("appLoaded"); |
106 | this._didDraw = true; | 109 | this._didDraw = true; |
107 | } | 110 | } |
@@ -186,7 +189,7 @@ exports.Ninja = Montage.create(Component, { | |||
186 | transitionStopRule = "*" | 189 | transitionStopRule = "*" |
187 | } | 190 | } |
188 | 191 | ||
189 | this.currentDocument.documentRoot.elementModel.controller.setProperty(this.currentDocument.documentRoot, "background", background); | 192 | this.currentDocument.documentRoot.elementModel.controller.setProperty(this.currentDocument.documentRoot, "body-background", background); |
190 | this.currentDocument.documentRoot.elementModel.controller.setProperty(this.currentDocument.documentRoot, "overflow", overflow); | 193 | this.currentDocument.documentRoot.elementModel.controller.setProperty(this.currentDocument.documentRoot, "overflow", overflow); |
191 | this.currentDocument.documentRoot.elementModel.controller.changeSelector(this.currentDocument.documentRoot, "transitionStopRule", transitionStopRule); | 194 | this.currentDocument.documentRoot.elementModel.controller.changeSelector(this.currentDocument.documentRoot, "transitionStopRule", transitionStopRule); |
192 | 195 | ||