diff options
author | Valerio Virgillito | 2012-02-14 12:03:20 -0800 |
---|---|---|
committer | Valerio Virgillito | 2012-02-14 12:03:20 -0800 |
commit | 997ce3fb65f27b3d6f331f63b5dc22d3c7fb8f1e (patch) | |
tree | c7b1a12032fe68f14048f6c3f41b11f10f54b6f3 /js | |
parent | f766cc203f30ea43ae8b83cf4b65d45cc4435ee9 (diff) | |
parent | 08101852de934ed674807b26ab89f432daa4d6fe (diff) | |
download | ninja-997ce3fb65f27b3d6f331f63b5dc22d3c7fb8f1e.tar.gz |
Merge pull request #41 from mencio/live-preview-fix
Fixing the live preview background issue.
Diffstat (limited to 'js')
-rw-r--r-- | js/controllers/elements/stage-controller.js | 4 | ||||
-rw-r--r-- | js/ninja.reel/ninja.js | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/js/controllers/elements/stage-controller.js b/js/controllers/elements/stage-controller.js index af7c4858..a8546662 100644 --- a/js/controllers/elements/stage-controller.js +++ b/js/controllers/elements/stage-controller.js | |||
@@ -92,7 +92,11 @@ exports.StageController = Montage.create(ElementController, { | |||
92 | 92 | ||
93 | setProperty: { | 93 | setProperty: { |
94 | value: function(el, p, value) { | 94 | value: function(el, p, value) { |
95 | |||
95 | switch(p) { | 96 | switch(p) { |
97 | case "body-background": | ||
98 | el.elementModel.body.style.setProperty("background", value); | ||
99 | break; | ||
96 | case "background": | 100 | case "background": |
97 | el.elementModel.stageBackground.style.setProperty(p, value); | 101 | el.elementModel.stageBackground.style.setProperty(p, value); |
98 | break; | 102 | break; |
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 | ||