aboutsummaryrefslogtreecommitdiff
path: root/js/ninja.reel/ninja.js
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-02-14 13:02:12 -0800
committerJose Antonio Marquez2012-02-14 13:02:12 -0800
commitb56ee334f8b0f8d15f4c86726b6c3779743ea84f (patch)
tree7b32276f368d0a541350f9727ad400806a008d31 /js/ninja.reel/ninja.js
parent646b269da2387582531258d14a3f2ff550617323 (diff)
parent997ce3fb65f27b3d6f331f63b5dc22d3c7fb8f1e (diff)
downloadninja-b56ee334f8b0f8d15f4c86726b6c3779743ea84f.tar.gz
Merge branch 'refs/heads/NinjaInternal' into FileIO
Diffstat (limited to 'js/ninja.reel/ninja.js')
-rwxr-xr-xjs/ninja.reel/ninja.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js
index 6c82cf30..43087c39 100755
--- a/js/ninja.reel/ninja.js
+++ b/js/ninja.reel/ninja.js
@@ -189,7 +189,7 @@ exports.Ninja = Montage.create(Component, {
189 transitionStopRule = "*" 189 transitionStopRule = "*"
190 } 190 }
191 191
192 this.currentDocument.documentRoot.elementModel.controller.setProperty(this.currentDocument.documentRoot, "background", background); 192 this.currentDocument.documentRoot.elementModel.controller.setProperty(this.currentDocument.documentRoot, "body-background", background);
193 this.currentDocument.documentRoot.elementModel.controller.setProperty(this.currentDocument.documentRoot, "overflow", overflow); 193 this.currentDocument.documentRoot.elementModel.controller.setProperty(this.currentDocument.documentRoot, "overflow", overflow);
194 this.currentDocument.documentRoot.elementModel.controller.changeSelector(this.currentDocument.documentRoot, "transitionStopRule", transitionStopRule); 194 this.currentDocument.documentRoot.elementModel.controller.changeSelector(this.currentDocument.documentRoot, "transitionStopRule", transitionStopRule);
195 195