diff options
| author | Valerio Virgillito | 2012-02-14 12:03:50 -0800 |
|---|---|---|
| committer | Valerio Virgillito | 2012-02-14 12:03:50 -0800 |
| commit | f059d6ae73b7e88bb6562cabe0f9ca00603647b8 (patch) | |
| tree | 58084129b0481977ea299c56f19fa55bb2370c60 /js/ninja.reel/ninja.js | |
| parent | ab1466b2627e40f58afcaa3d425d4145fa47525a (diff) | |
| parent | 08101852de934ed674807b26ab89f432daa4d6fe (diff) | |
| download | ninja-f059d6ae73b7e88bb6562cabe0f9ca00603647b8.tar.gz | |
Merge branch 'live-preview-fix' of https://github.com/mencio/ninja-internal into integration
Diffstat (limited to 'js/ninja.reel/ninja.js')
| -rwxr-xr-x | 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 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 | ||