aboutsummaryrefslogtreecommitdiff
path: root/js/controllers/elements/body-controller.js
diff options
context:
space:
mode:
authorEric Guzman2012-05-18 21:51:08 -0700
committerEric Guzman2012-05-18 21:51:08 -0700
commit84097be9d7dd3403a0ac12f8c039d3ffc5281cfc (patch)
tree4f03ddf6620be09d4a755bdf647da2adc1df8908 /js/controllers/elements/body-controller.js
parent13da56e791b7478ad3dbb8162a583a6b2c8c4b6b (diff)
parent10471fc02fa75040baf337bc62ff683854793f81 (diff)
downloadninja-84097be9d7dd3403a0ac12f8c039d3ffc5281cfc.tar.gz
Merge branch 'dom-architecture' of github.com:Motorola-Mobility/ninja-internal into CSSPanelUpdates
Diffstat (limited to 'js/controllers/elements/body-controller.js')
-rwxr-xr-xjs/controllers/elements/body-controller.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/controllers/elements/body-controller.js b/js/controllers/elements/body-controller.js
index 5c23dcf7..7a3a66f5 100755
--- a/js/controllers/elements/body-controller.js
+++ b/js/controllers/elements/body-controller.js
@@ -30,7 +30,7 @@ exports.BodyController = Montage.create(ElementController, {
30 value: function(el, p) { 30 value: function(el, p) {
31 switch(p) { 31 switch(p) {
32 case "background" : 32 case "background" :
33 return this.application.ninja.colorController.getColorObjFromCss(this.application.ninja.stylesController.getElementStyle(el, "background-color", true, true)); 33 return this.application.ninja.colorController.getColorObjFromCss(this.application.ninja.stylesController.getElementStyle(el, "background-color", false, true));
34 case "border": 34 case "border":
35 return 0; 35 return 0;
36 case "height": 36 case "height":