aboutsummaryrefslogtreecommitdiff
path: root/js/controllers
diff options
context:
space:
mode:
authorValerio Virgillito2012-06-07 22:26:28 -0700
committerValerio Virgillito2012-06-07 22:26:28 -0700
commitd14249dd2d76e9eb8d14733c10393d36bd2ea8ee (patch)
tree5bd5147b1b130c81ca8be3dbc192a04038247062 /js/controllers
parenta67e6e8783dcdfd3a3bbcff36dc086dded6c7656 (diff)
parent4a4a4498b0c55111ff49d1dc939fe22cbe31e975 (diff)
downloadninja-d14249dd2d76e9eb8d14733c10393d36bd2ea8ee.tar.gz
Merge pull request #283 from mqg734/BodyPI
Body PI fixes.
Diffstat (limited to 'js/controllers')
-rwxr-xr-xjs/controllers/elements/body-controller.js2
-rwxr-xr-xjs/controllers/styles-controller.js4
2 files changed, 5 insertions, 1 deletions
diff --git a/js/controllers/elements/body-controller.js b/js/controllers/elements/body-controller.js
index a2aa041f..0dc11b82 100755
--- a/js/controllers/elements/body-controller.js
+++ b/js/controllers/elements/body-controller.js
@@ -31,7 +31,7 @@ exports.BodyController = Montage.create(ElementController, {
31 switch(p) { 31 switch(p) {
32 case "background" : 32 case "background" :
33 case "background-color": 33 case "background-color":
34 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"));
35 case "border": 35 case "border":
36 return 0; 36 return 0;
37 case "height": 37 case "height":
diff --git a/js/controllers/styles-controller.js b/js/controllers/styles-controller.js
index 83722184..a25a05df 100755
--- a/js/controllers/styles-controller.js
+++ b/js/controllers/styles-controller.js
@@ -154,6 +154,10 @@ var stylesController = exports.StylesController = Montage.create(Component, {
154 styles['-webkit-transform-style'] = 'preserve-3d'; 154 styles['-webkit-transform-style'] = 'preserve-3d';
155 needsRule = true; 155 needsRule = true;
156 } 156 }
157 if(this.getElementStyle(this.currentDocument.model.documentRoot, "background-color", false, false) == null) {
158 styles['background-color'] = "transparent";
159 needsRule = true;
160 }
157 161
158 if(needsRule) { 162 if(needsRule) {
159 rule = this.addRule('.ninja-body{}'); 163 rule = this.addRule('.ninja-body{}');