aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValerio Virgillito2012-02-14 12:03:50 -0800
committerValerio Virgillito2012-02-14 12:03:50 -0800
commitf059d6ae73b7e88bb6562cabe0f9ca00603647b8 (patch)
tree58084129b0481977ea299c56f19fa55bb2370c60
parentab1466b2627e40f58afcaa3d425d4145fa47525a (diff)
parent08101852de934ed674807b26ab89f432daa4d6fe (diff)
downloadninja-f059d6ae73b7e88bb6562cabe0f9ca00603647b8.tar.gz
Merge branch 'live-preview-fix' of https://github.com/mencio/ninja-internal into integration
-rwxr-xr-xjs/controllers/elements/stage-controller.js4
-rwxr-xr-xjs/ninja.reel/ninja.js2
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 100755
--- 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 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