diff options
| author | Nivesh Rajbhandari | 2012-02-14 13:46:46 -0800 |
|---|---|---|
| committer | Nivesh Rajbhandari | 2012-02-14 13:46:46 -0800 |
| commit | 43ca408a498a7895c26bacf7135e65e6b5b3602a (patch) | |
| tree | 4935ea1a35e89b0070380276be361dc80e69f5b2 /js/ninja.reel/ninja.js | |
| parent | d77deb60ade63d8526ce16d0b104285411218e14 (diff) | |
| parent | 997ce3fb65f27b3d6f331f63b5dc22d3c7fb8f1e (diff) | |
| download | ninja-43ca408a498a7895c26bacf7135e65e6b5b3602a.tar.gz | |
Merge branch 'refs/heads/ninja-internal' into ToolFixes
Diffstat (limited to 'js/ninja.reel/ninja.js')
| -rw-r--r-- | js/ninja.reel/ninja.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js index 469d38f7..e9c79230 100644 --- a/js/ninja.reel/ninja.js +++ b/js/ninja.reel/ninja.js | |||
| @@ -186,7 +186,7 @@ exports.Ninja = Montage.create(Component, { | |||
| 186 | transitionStopRule = "*" | 186 | transitionStopRule = "*" |
| 187 | } | 187 | } |
| 188 | 188 | ||
| 189 | this.currentDocument.documentRoot.elementModel.controller.setProperty(this.currentDocument.documentRoot, "background", background); | 189 | this.currentDocument.documentRoot.elementModel.controller.setProperty(this.currentDocument.documentRoot, "body-background", background); |
| 190 | this.currentDocument.documentRoot.elementModel.controller.setProperty(this.currentDocument.documentRoot, "overflow", overflow); | 190 | this.currentDocument.documentRoot.elementModel.controller.setProperty(this.currentDocument.documentRoot, "overflow", overflow); |
| 191 | this.currentDocument.documentRoot.elementModel.controller.changeSelector(this.currentDocument.documentRoot, "transitionStopRule", transitionStopRule); | 191 | this.currentDocument.documentRoot.elementModel.controller.changeSelector(this.currentDocument.documentRoot, "transitionStopRule", transitionStopRule); |
| 192 | 192 | ||