diff options
author | Nivesh Rajbhandari | 2012-06-07 15:17:19 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-06-07 15:17:19 -0700 |
commit | 21098080e7716379ceefefca5f3cc1850ac78fa7 (patch) | |
tree | d7d4d0091eccf23a31b05096cdcdeb597cff63e2 | |
parent | b75fe9369f7caec0351d298f7106c8d59572b440 (diff) | |
download | ninja-21098080e7716379ceefefca5f3cc1850ac78fa7.tar.gz |
Body PI fixes.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
-rwxr-xr-x | js/controllers/elements/body-controller.js | 2 | ||||
-rwxr-xr-x | js/controllers/styles-controller.js | 4 | ||||
-rwxr-xr-x | js/models/element-model.js | 6 |
3 files changed, 11 insertions, 1 deletions
diff --git a/js/controllers/elements/body-controller.js b/js/controllers/elements/body-controller.js index 9c427c62..106fdcd0 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", false, true)); | 33 | return this.application.ninja.colorController.getColorObjFromCss(this.application.ninja.stylesController.getElementStyle(el, "background-color")); |
34 | case "border": | 34 | case "border": |
35 | return 0; | 35 | return 0; |
36 | case "height": | 36 | 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")) { |