diff options
| author | Valerio Virgillito | 2012-02-14 13:11:19 -0800 |
|---|---|---|
| committer | Valerio Virgillito | 2012-02-14 13:11:19 -0800 |
| commit | 3eb735bdc9016b889e9066be680ebd9fbc0c60c0 (patch) | |
| tree | 3119aa07bdde5aecc3af2d29ff67b83c48601e10 /js/ninja.reel/ninja.js | |
| parent | df898049b2990f456a305eb18434b887468225cf (diff) | |
| parent | 997ce3fb65f27b3d6f331f63b5dc22d3c7fb8f1e (diff) | |
| download | ninja-3eb735bdc9016b889e9066be680ebd9fbc0c60c0.tar.gz | |
Merge branch 'refs/heads/master' into components
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 | ||