diff options
author | Ananya Sen | 2012-05-18 16:57:27 -0700 |
---|---|---|
committer | Ananya Sen | 2012-05-18 16:57:27 -0700 |
commit | bddbcd15c165ac0731de204b023a1e60d71b5d79 (patch) | |
tree | 727997cc71d5e9c951c1089dfbdeb90cd3b68e6f /js/controllers/elements/body-controller.js | |
parent | 7a22f7b368ef549a5b30c58a0f3900685b764bdb (diff) | |
parent | e7c288fe8f5d3a9e5c9f0eb0a045c6c195a0e7b8 (diff) | |
download | ninja-bddbcd15c165ac0731de204b023a1e60d71b5d79.tar.gz |
Merge branch 'refs/heads/master-dom-architecture' into dom-architecture
Diffstat (limited to 'js/controllers/elements/body-controller.js')
-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": |