Merge branch 'refs/heads/master' into undo-manager

Conflicts:
	js/controllers/elements/element-controller.js

Signed-off-by: Valerio Virgillito <valerio@motorola.com>

3 files changed, 44 insertions, 24 deletions

diff --git a/js/controllers/elements/element-controller.js b/js/controllers/elements/element-controller.js
index b8411ac0..0f17dd46 100755
--- a/js/controllers/elements/element-controller.js
+++ b/js/controllers/elements/element-controller.js
@@ -60,7 +60,7 @@ exports.ElementController = Montage.create(Component, {
 
             for(var property in properties) {
                 this.application.ninja.stylesController.setElementStyle(element, property, properties[property]);
-            }
+        }
         }
     },
 
@@ -231,10 +231,6 @@ exports.ElementController = Montage.create(Component, {
                 return el.elementModel.props3D.perspectiveDist;
             } else {
                 var dist = this.application.ninja.stylesController.getPerspectiveDistFromElement(el, false);
-                if(dist == null) {
-                    dist = 1400;
-                }
-
                 el.elementModel.props3D.perspectiveDist = dist;
                 return dist;
             }
@@ -246,7 +242,12 @@ exports.ElementController = Montage.create(Component, {
         value: function(el, props, index, update3DModel) {
             var dist = props[index]["dist"],
                 mat = props[index]["mat"];
-            this.application.ninja.stylesController.setElementStyle(el, "-webkit-transform", "perspective(" + dist + ") " + "matrix3d(" + MathUtils.scientificToDecimal(mat, 5) + ")");
+            this.application.ninja.stylesController.setElementStyle(el, "-webkit-transform", "matrix3d(" + MathUtils.scientificToDecimal(mat, 5) + ")");
+
+            this.application.ninja.stylesController.setElementStyle(el, "-webkit-transform-style", "preserve-3d");
+
+            // TODO - We don't support perspective on individual elements yet
+//            this.application.ninja.stylesController.setElementStyle(el, "-webkit-perspective", dist);
 
             el.elementModel.props3D.matrix3d = mat;
             el.elementModel.props3D.perspectiveDist = dist;
diff --git a/js/controllers/elements/stage-controller.js b/js/controllers/elements/stage-controller.js
index dc916b1a..f376e40f 100755
--- a/js/controllers/elements/stage-controller.js
+++ b/js/controllers/elements/stage-controller.js
@@ -90,7 +90,7 @@ exports.StageController = Montage.create(ElementController, {
                         return el.elementModel.stageView.style.getProperty(p);
                     }
                 default:
-                    return ElementController.getProperty(el, p, false, true);
+                    return ElementController.getProperty(el, p, true, true);
                     //console.log("Undefined Stage property ", p);
             }
         }
@@ -119,6 +119,7 @@ exports.StageController = Montage.create(ElementController, {
                     break;
                 case "-webkit-transform-style":
                     el.elementModel.stageView.style.setProperty(p, value);
+                    this.application.ninja.stage.updatedStage = true;
                     break;
                 default:
                     console.log("Undefined property ", p, "for the Stage Controller");
@@ -178,5 +179,20 @@ exports.StageController = Montage.create(ElementController, {
                 return mat;
             }
         }
-    }
+    },
+
+    getPerspectiveDist: {
+        value: function(el) {
+            if(el.elementModel && el.elementModel.props3D && el.elementModel.props3D.perspectiveDist)
+            {
+                return el.elementModel.props3D.perspectiveDist;
+            }
+            else
+            {
+                var dist = this.application.ninja.stylesController.getPerspectiveDistFromElement(el, true);
+                el.elementModel.props3D.perspectiveDist = dist;
+                return dist;
+            }
+        }
+    },
 });
diff --git a/js/controllers/styles-controller.js b/js/controllers/styles-controller.js
index 5d5f27ba..ec4314f9 100755
--- a/js/controllers/styles-controller.js
+++ b/js/controllers/styles-controller.js
@@ -1130,7 +1130,7 @@ var stylesController = exports.StylesController = Montage.create(Component, {
 
     getMatrixFromElement : {
         value: function(element, isStage) {
-            var xformStr = this.getElementStyle(element, "-webkit-transform", false, isStage),
+            var xformStr = this.getElementStyle(element, "-webkit-transform", true, isStage),
                 mat;
 
             if (xformStr) {
@@ -1163,26 +1163,29 @@ var stylesController = exports.StylesController = Montage.create(Component, {
 
     getPerspectiveDistFromElement : {
         value: function(element, isStage) {
-            var xformStr = this.getElementStyle(element, "-webkit-transform", false, isStage),
+            var xformStr = this.getElementStyle(element, "-webkit-perspective", false, isStage),
                 dist;
 
-            if (xformStr) {
-                var index1 = xformStr.indexOf( "perspective(");
-                if (index1 >= 0) {
-                    index1 += 12;    // do not include 'perspective('
-                    var index2 = xformStr.indexOf( ")", index1 );
-                    if (index2 >= 0) {
-                        var substr = xformStr.substr( index1, (index2-index1));
-                        if (substr && (substr.length > 0)) {
-                            dist = parseInt( substr );
+            if(xformStr) {
+                dist = parseInt(xformStr);
+            } else {
+                xformStr = this.getElementStyle(element, "-webkit-transform", true, isStage);
+                if (xformStr) {
+                    var index1 = xformStr.indexOf( "perspective(");
+                    if (index1 >= 0) {
+                        index1 += 12;    // do not include 'perspective('
+                        var index2 = xformStr.indexOf( ")", index1 );
+                        if (index2 >= 0) {
+                            var substr = xformStr.substr( index1, (index2-index1));
+                            if (substr && (substr.length > 0)) {
+                                dist = parseInt( substr );
+                            }
                         }
                     }
                 }
-            } else {
-                xformStr = this.getElementStyle(element, "-webkit-perspective", false, isStage);
-                if(xformStr) {
-                    dist = parseInt(xformStr);
-                }
+            }
+            if(isNaN(dist)) {
+                dist = null;
             }
             return dist;
         }