aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-02-22 11:35:35 -0800
committerNivesh Rajbhandari2012-02-22 11:35:35 -0800
commiteb8223a286e3703a0b7995f5472aaec8dcffd7f8 (patch)
tree744c8f4e69a045e260c8a471c9c47688d585f551
parentecd0dc6ffd21aedfb5ae8f617af36e48a2ba72ce (diff)
downloadninja-eb8223a286e3703a0b7995f5472aaec8dcffd7f8.tar.gz
Color chips expect a color object, not a css value.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
-rwxr-xr-xjs/controllers/elements/stage-controller.js4
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":