aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xjs/controllers/elements/body-controller.js2
-rwxr-xr-xjs/controllers/styles-controller.js4
-rwxr-xr-xjs/models/element-model.js6
3 files changed, 11 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{}');
diff --git a/js/models/element-model.js b/js/models/element-model.js
index c9fb58d8..76f15b21 100755
--- a/js/models/element-model.js
+++ b/js/models/element-model.js
@@ -49,6 +49,12 @@ var getInfoForElement = function(el) {
49 isShape = true; 49 isShape = true;
50 } 50 }
51 51
52 if(el.nodeName.toLowerCase() === "ninja-content") {
53 elementName = "body";
54 controller = elementNameToController(elementName);
55 pi = elementNameToPi(elementName);
56 }
57
52 // TODO: Add this in case there is no controller for the component 58 // TODO: Add this in case there is no controller for the component
53 /* 59 /*
54 if(el.getAttribute("data-montage-id")) { 60 if(el.getAttribute("data-montage-id")) {