From 8f8f7f9a36fb9abadea2a9f25aef0084946bebc9 Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Fri, 4 May 2012 14:42:00 -0700
Subject: Removed special-casing for new template workflow.  Instead, we will
 enforce a width and height on the body in order to do 3d.

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
---
 js/controllers/elements/body-controller.js | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

(limited to 'js/controllers/elements/body-controller.js')

diff --git a/js/controllers/elements/body-controller.js b/js/controllers/elements/body-controller.js
index 14aeae24..943594f2 100755
--- a/js/controllers/elements/body-controller.js
+++ b/js/controllers/elements/body-controller.js
@@ -28,11 +28,39 @@ exports.BodyController = Montage.create(ElementController, {
 
     getProperty: {
         value: function(el, p) {
+            switch(p) {
+                case "background" :
+                    return this.application.ninja.colorController.getColorObjFromCss(this.application.ninja.stylesController.getElementStyle(el, "background-color", true, true));
+                case "border":
+                    return 0;
+                case "height":
+                case "width":
+                case "-webkit-transform-style":
+                    return this.application.ninja.stylesController.getElementStyle(el, p, true, true);
+                default:
+                    return ElementController.getProperty(el, p, true, true);
+                    //console.log("Undefined Stage property ", p);
+            }
         }
     },
 
     setProperty: {
         value: function(el, p, value) {
+            switch(p) {
+                case "body-background":
+                case "background":
+                    this.application.ninja.stylesController.setElementStyle(el, "background-color", value, true);
+                    break;
+                case "overflow":
+                case "width":
+                case "height":
+                case "-webkit-transform-style":
+                    this.application.ninja.stylesController.setElementStyle(el, p, value, true);
+                    this.application.ninja.stage.updatedStage = true;
+                    break;
+                default:
+                    console.log("Undefined property ", p, "for the Body Controller");
+            }
         }
     },
 
-- 
cgit v1.2.3


From 2088ff54c96af4bd5c96075b74939b50c56f5f24 Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Thu, 10 May 2012 12:01:16 -0700
Subject: New stage template should not distinguish between user and template
 body styles.

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
---
 js/controllers/elements/body-controller.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'js/controllers/elements/body-controller.js')

diff --git a/js/controllers/elements/body-controller.js b/js/controllers/elements/body-controller.js
index 943594f2..5c23dcf7 100755
--- a/js/controllers/elements/body-controller.js
+++ b/js/controllers/elements/body-controller.js
@@ -13,7 +13,7 @@ exports.BodyController = Montage.create(ElementController, {
     set3DProperties: {
         value: function(el, props, update3DModel) {
             var dist = props["dist"], mat = props["mat"];
-            this.application.ninja.stylesController.setElementStyle(el, "-webkit-transform", "perspective(" + dist + ") " + "matrix3d(" + MathUtils.scientificToDecimal(mat, 5) + ")", true);
+            this.application.ninja.stylesController.setElementStyle(el, "-webkit-transform", "perspective(" + dist + ") " + "matrix3d(" + MathUtils.scientificToDecimal(mat, 5) + ")");
 
             el.elementModel.props3D.matrix3d = mat;
             el.elementModel.props3D.perspectiveDist = dist;
@@ -49,13 +49,13 @@ exports.BodyController = Montage.create(ElementController, {
             switch(p) {
                 case "body-background":
                 case "background":
-                    this.application.ninja.stylesController.setElementStyle(el, "background-color", value, true);
+                    this.application.ninja.stylesController.setElementStyle(el, "background-color", value);
                     break;
                 case "overflow":
                 case "width":
                 case "height":
                 case "-webkit-transform-style":
-                    this.application.ninja.stylesController.setElementStyle(el, p, value, true);
+                    this.application.ninja.stylesController.setElementStyle(el, p, value);
                     this.application.ninja.stage.updatedStage = true;
                     break;
                 default:
-- 
cgit v1.2.3


From fdfba499f0b84360b96096fa866a981e96e8756c Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Fri, 18 May 2012 16:35:56 -0700
Subject: fixing the color chip for the document root

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 js/controllers/elements/body-controller.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js/controllers/elements/body-controller.js')

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, {
         value: function(el, p) {
             switch(p) {
                 case "background" :
-                    return this.application.ninja.colorController.getColorObjFromCss(this.application.ninja.stylesController.getElementStyle(el, "background-color", true, true));
+                    return this.application.ninja.colorController.getColorObjFromCss(this.application.ninja.stylesController.getElementStyle(el, "background-color", false, true));
                 case "border":
                     return 0;
                 case "height":
-- 
cgit v1.2.3