diff options
author | Nivesh Rajbhandari | 2012-05-18 17:12:53 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-05-18 17:12:53 -0700 |
commit | 8a15ac2b4a7d528d04c73bf6d9c6e724d8c6ac50 (patch) | |
tree | 345d582d72c2064e6e4ebbd23cbb7bb6c81e96df /js/controllers/elements | |
parent | ca70f18a62a2a2b5670be132361e3a3f5907d920 (diff) | |
parent | e7c288fe8f5d3a9e5c9f0eb0a045c6c195a0e7b8 (diff) | |
download | ninja-8a15ac2b4a7d528d04c73bf6d9c6e724d8c6ac50.tar.gz |
Merge branch 'refs/heads/dom-architecture-master' into Dom-Architecture
Diffstat (limited to 'js/controllers/elements')
-rwxr-xr-x | js/controllers/elements/body-controller.js | 2 |
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": |