diff options
author | Valerio Virgillito | 2012-06-07 15:30:13 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-06-07 15:30:13 -0700 |
commit | 2e331fc1daba0f6f29191a36cf7647f6f5dc36ee (patch) | |
tree | 6a9997c67f581a872bf29ba5da05dfd14ad81dc3 /js/controllers/elements/body-controller.js | |
parent | b75fe9369f7caec0351d298f7106c8d59572b440 (diff) | |
parent | 25d639e6c7dd737f4671011faf07091c86c0e324 (diff) | |
download | ninja-2e331fc1daba0f6f29191a36cf7647f6f5dc36ee.tar.gz |
Merge pull request #282 from mencio/colorchip-fix
fixing the body color chip for non banners templates
Diffstat (limited to 'js/controllers/elements/body-controller.js')
-rwxr-xr-x | js/controllers/elements/body-controller.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/js/controllers/elements/body-controller.js b/js/controllers/elements/body-controller.js index 9c427c62..a2aa041f 100755 --- a/js/controllers/elements/body-controller.js +++ b/js/controllers/elements/body-controller.js | |||
@@ -30,6 +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 | case "background-color": | ||
33 | return this.application.ninja.colorController.getColorObjFromCss(this.application.ninja.stylesController.getElementStyle(el, "background-color", false, true)); | 34 | return this.application.ninja.colorController.getColorObjFromCss(this.application.ninja.stylesController.getElementStyle(el, "background-color", false, true)); |
34 | case "border": | 35 | case "border": |
35 | return 0; | 36 | return 0; |
@@ -47,8 +48,8 @@ exports.BodyController = Montage.create(ElementController, { | |||
47 | setProperty: { | 48 | setProperty: { |
48 | value: function(el, p, value) { | 49 | value: function(el, p, value) { |
49 | switch(p) { | 50 | switch(p) { |
50 | case "body-background": | ||
51 | case "background": | 51 | case "background": |
52 | case "background-color": | ||
52 | this.application.ninja.stylesController.setElementStyle(el, "background-color", value); | 53 | this.application.ninja.stylesController.setElementStyle(el, "background-color", value); |
53 | break; | 54 | break; |
54 | case "overflow": | 55 | case "overflow": |