Merge branch 'master' into pentool

Conflicts:
	js/tools/PenTool.js

1 files changed, 11 insertions, 10 deletions

diff --git a/js/tools/TagTool.js b/js/tools/TagTool.js
index 5512165e..d946db72 100755
--- a/js/tools/TagTool.js
+++ b/js/tools/TagTool.js
@@ -221,22 +221,23 @@ exports.TagTool = Montage.create(DrawingTool, {
     },
 
     makeElement: {
-        value: function(w, h, planeMat, midPt,tag) {
-            var styles;
-            
+        value: function(w, h, planeMat, midPt, tag, isShape) {
             var left = Math.round(midPt[0] - 0.5 * w);
             var top = Math.round(midPt[1] - 0.5 * h);
 
-            var matStr = DrawingToolBase.getElementMatrix(planeMat, midPt);
-
-            styles = {
+            var styles = {
                 'position': 'absolute',
                 'top' : top + 'px',
-                'left' : left + 'px',
-                '-webkit-transform-style' : 'preserve-3d',
-                '-webkit-transform' : matStr
+                'left' : left + 'px'
             };
 
+            if(!MathUtils.isIdentityMatrix(planeMat)) {
+                styles['-webkit-transform-style'] = 'preserve-3d';
+                styles['-webkit-transform'] = DrawingToolBase.getElementMatrix(planeMat, midPt);
+            } else if(isShape) {
+                styles['-webkit-transform-style'] = 'preserve-3d';
+            }
+
             // TODO - for canvas, set both as style and attribute.
             // Otherwise, we need to create a separate controller for canvas elements
             if(tag.tagName === "CANVAS") {
@@ -255,7 +256,7 @@ exports.TagTool = Montage.create(DrawingTool, {
         value: function(tag) {
             var styles = {
                 "-webkit-transform-style": "preserve-3d",
-                "-webkit-transform": "perspective(1400) matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1)"
+                "-webkit-transform": "matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1)"
             };
             tag.innerHTML = "content";