diff options
author | Eric Guzman | 2012-02-13 15:59:04 -0800 |
---|---|---|
committer | Eric Guzman | 2012-02-13 15:59:04 -0800 |
commit | 4476cac328a6db61169b0620e495fe88f5fafa17 (patch) | |
tree | 5fd4bef738fc7d6a2fe225c99207d51a20861048 /js/controllers/elements | |
parent | 6dc5d31b201d3578bf17b4f1fa7b1b9865d46153 (diff) | |
parent | 30b23f8d0343c1af805d62894591001f19c6fb79 (diff) | |
download | ninja-4476cac328a6db61169b0620e495fe88f5fafa17.tar.gz |
Merge branch 'refs/heads/master' into PresetsPanel
Diffstat (limited to 'js/controllers/elements')
-rw-r--r-- | js/controllers/elements/stage-controller.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/js/controllers/elements/stage-controller.js b/js/controllers/elements/stage-controller.js index b8170826..af7c4858 100644 --- a/js/controllers/elements/stage-controller.js +++ b/js/controllers/elements/stage-controller.js | |||
@@ -75,6 +75,8 @@ exports.StageController = Montage.create(ElementController, { | |||
75 | getProperty: { | 75 | getProperty: { |
76 | value: function(el, p) { | 76 | value: function(el, p) { |
77 | switch(p) { | 77 | switch(p) { |
78 | case "background" : | ||
79 | return el.elementModel.stageBackground.style.getProperty(p); | ||
78 | case "border": | 80 | case "border": |
79 | return el.elementModel.stageView.style.getProperty(p); | 81 | return el.elementModel.stageView.style.getProperty(p); |
80 | case "height": | 82 | case "height": |
@@ -92,7 +94,7 @@ exports.StageController = Montage.create(ElementController, { | |||
92 | value: function(el, p, value) { | 94 | value: function(el, p, value) { |
93 | switch(p) { | 95 | switch(p) { |
94 | case "background": | 96 | case "background": |
95 | el.elementModel.body.style.setProperty(p, value); | 97 | el.elementModel.stageBackground.style.setProperty(p, value); |
96 | break; | 98 | break; |
97 | case "overflow": | 99 | case "overflow": |
98 | el.elementModel.viewPort.style.setProperty(p, value); | 100 | el.elementModel.viewPort.style.setProperty(p, value); |