diff options
author | hwc487 | 2012-02-23 15:21:56 -0800 |
---|---|---|
committer | hwc487 | 2012-02-23 15:21:56 -0800 |
commit | 26bb2894c29d4608e843de01829d352dd3d00823 (patch) | |
tree | c5a9d10976304fe5b3dec59f40977d8c72df57de /js/controllers/elements | |
parent | 64280907f31e6f6e5659acb0893df3e0da5bb044 (diff) | |
parent | 81ce79819ba574b03b46e91e9a153dab82b550cd (diff) | |
download | ninja-26bb2894c29d4608e843de01829d352dd3d00823.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into integration
Conflicts:
js/helper-classes/RDGE/GLWorld.js
js/helper-classes/RDGE/Materials/PulseMaterial.js
js/helper-classes/RDGE/Materials/RadialBlurMaterial.js
js/helper-classes/RDGE/src/tools/rdge-compiled.js
js/preloader/Preloader.js
Diffstat (limited to 'js/controllers/elements')
-rwxr-xr-x | js/controllers/elements/stage-controller.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/controllers/elements/stage-controller.js b/js/controllers/elements/stage-controller.js index a8546662..abad3736 100755 --- a/js/controllers/elements/stage-controller.js +++ b/js/controllers/elements/stage-controller.js | |||
@@ -76,7 +76,7 @@ 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 el.elementModel.stageView.style.getProperty(p); |
82 | case "height": | 82 | case "height": |