diff options
author | Nivesh Rajbhandari | 2012-02-22 11:35:35 -0800 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-02-22 11:35:35 -0800 |
commit | eb8223a286e3703a0b7995f5472aaec8dcffd7f8 (patch) | |
tree | 744c8f4e69a045e260c8a471c9c47688d585f551 /js | |
parent | ecd0dc6ffd21aedfb5ae8f617af36e48a2ba72ce (diff) | |
download | ninja-eb8223a286e3703a0b7995f5472aaec8dcffd7f8.tar.gz |
Color chips expect a color object, not a css value.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js')
-rwxr-xr-x | js/controllers/elements/stage-controller.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/controllers/elements/stage-controller.js b/js/controllers/elements/stage-controller.js index a8546662..f9adcda2 100755 --- a/js/controllers/elements/stage-controller.js +++ b/js/controllers/elements/stage-controller.js | |||
@@ -76,9 +76,9 @@ exports.StageController = Montage.create(ElementController, { | |||
76 | value: function(el, p) { | 76 | value: function(el, p) { |
77 | switch(p) { | 77 | switch(p) { |
78 | case "background" : | 78 | case "background" : |
79 | return el.elementModel.stageBackground.style.getProperty(p); | 79 | return this.application.ninja.colorController.getColorObjFromCss(el.elementModel.stageBackground.style.getProperty(p)); |
80 | case "border": | 80 | case "border": |
81 | return el.elementModel.stageView.style.getProperty(p); | 81 | return this.application.ninja.colorController.getColorObjFromCss(el.elementModel.stageView.style.getProperty(p)); |
82 | case "height": | 82 | case "height": |
83 | return el.elementModel.stageDimension.style.getProperty(p); | 83 | return el.elementModel.stageDimension.style.getProperty(p); |
84 | case "width": | 84 | case "width": |