Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into 3DBugs

9 files changed, 87 insertions, 50 deletions

diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.js b/js/components/layout/bread-crumb.reel/bread-crumb.js
index e396bdbf..c1b021a3 100755
--- a/js/components/layout/bread-crumb.reel/bread-crumb.js
+++ b/js/components/layout/bread-crumb.reel/bread-crumb.js
@@ -23,7 +23,7 @@ exports.Breadcrumb = Montage.create(Component, {
         value: function(){
             if(!this.application.ninja.documentController.activeDocument) {
                 this.disabled = true;
-                this.application.ninja.currentSelectedContainer = this.application.ninja.currentDocument.documentRoot;
+                this.application.ninja.currentSelectedContainer = (this.application.ninja.currentDocument ? this.application.ninja.currentDocument.documentRoot : null);
             }
         }
     },
diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index 6d11bd0e..c6bf4c6b 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -427,10 +427,6 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
 
     closeDocument: {
         value: function(id) {
-            if(this.activeDocument.needsSave === true){
-                //if file dirty then alert user to save
-        }
-
             var doc = this._findDocumentByUUID(id);
 
             var closeDocumentIndex = this._findIndexByUUID(id);
diff --git a/js/controllers/styles-controller.js b/js/controllers/styles-controller.js
index ec4314f9..647c0870 100755
--- a/js/controllers/styles-controller.js
+++ b/js/controllers/styles-controller.js
@@ -1102,7 +1102,7 @@ var stylesController = exports.StylesController = Montage.create(Component, {
                 ///// The dominant rule might not have the style property defined - why?
                 ///// If no rules have the property defined, we can use the
                 ///// most-specific single-target rule as the dominant rule (for setting styles)
-                return element.ownerDocument.defaultView.getComputedStyle(element).getPropertyValue(property);
+                return (element.ownerDocument.defaultView ? element.ownerDocument.defaultView.getComputedStyle(element).getPropertyValue(property) : null);
             }
 
             return value;
diff --git a/js/helper-classes/3D/snap-manager.js b/js/helper-classes/3D/snap-manager.js
index f4bfc12b..6766ac7f 100755
--- a/js/helper-classes/3D/snap-manager.js
+++ b/js/helper-classes/3D/snap-manager.js
@@ -1957,6 +1957,8 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
                         var localPt = hitRec.getLocalPoint();
                         var planeMat = hitRec.getPlaneMatrix();
             var stageWorldPt;
+
+                        /*
             if(inGlobalMode)
             {
                 stageWorldPt = MathUtils.transformPoint(localPt,planeMat);
@@ -1965,6 +1967,8 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
             {
                 stageWorldPt = viewUtils.postViewToStageWorld( MathUtils.transformPoint(localPt,planeMat),  elt );
             }
+                        */
+            stageWorldPt = viewUtils.postViewToStageWorld( MathUtils.transformPoint(localPt,planeMat),  elt );
 
                         /*
                          // get a working plane parallel to the current working plane through the stage world point
diff --git a/js/helper-classes/3D/view-utils.js b/js/helper-classes/3D/view-utils.js
index 40a19b90..919f7c50 100755
--- a/js/helper-classes/3D/view-utils.js
+++ b/js/helper-classes/3D/view-utils.js
@@ -124,35 +124,81 @@ exports.ViewUtils = Montage.create(Component, {
         }
     },
 
-    getNormalToUnprojectedElementPlane: {
-        value: function( elt ) {
-            var mat = this.getMatrixFromElement(elt);
+    /*
+         *  This method will return a normal to a plane containing the Z axis and either the
+         *  x or y axis of the element.
+         */
+        getNormalToUnprojectedElementPlane:
+        {
+        value: function( elt, axis,  localMode )
+                {
+            var objMat = this.getMatrixFromElement(elt);
+                        var objMatInv = glmat4.inverse( objMat, [] );
 
-            var xVec = [mat[0],  mat[1],  mat[2],  mat[3]];
-            var yVec = [mat[4],  mat[5],  mat[6],  mat[7]];
+            var xVec = [1,0,0];
+            var yVec = [0,1,0];
+            var zVec = [0,0,1];
 
             var stage = this.application.ninja.currentDocument.documentRoot;
             var stageMat = this.getMatrixFromElement(stage);
-            var stagePlane = [stageMat[8],  stageMat[9],  stageMat[10],  stageMat[11]];
 
+                        var mat = glmat4.multiply( stageMat, objMat, [] );
+                        
+                        var viewDir;
+                        if (localMode)
+                        {
+                                var matInv = glmat4.inverse( mat, [] );
+                                viewDir = MathUtils.transformVector( [0,0,1], matInv );
+                        }
+                        else
+                        {
+                                var stageInv = glmat4.inverse( stageMat, [] );
+                                viewDir = MathUtils.transformVector( [0,0,1],  stageInv );
+                        }
+
+                        /*
                         if (elt === stage)
                         {
                                 xVec = [1,0,0];
                                 yVec = [0,1,0];
                         }
+                        */
 
-            var xDot = Math.abs(vecUtils.vecDot(3, xVec, stagePlane));
-            var yDot = Math.abs(vecUtils.vecDot(3, yVec, stagePlane));
+                        var plane;
+                        var xDot, yDot, zDot;
+                        switch (axis)
+                        {
+                                case 0:
+                                        yDot = Math.abs(vecUtils.vecDot(3, yVec, viewDir));
+                                        zDot = Math.abs(vecUtils.vecDot(3, zVec, viewDir));
+                                        if(yDot > zDot)
+                                                plane = vecUtils.vecCross( 3, zVec, xVec );
+                                        else
+                                                plane = vecUtils.vecCross( 3, yVec, xVec );
+                                        break;
+                                        
+                                case 1:
+                                        xDot = Math.abs(vecUtils.vecDot(3, yVec, viewDir));
+                                        zDot = Math.abs(vecUtils.vecDot(3, zVec, viewDir));
+                                        if(xDot > zDot)
+                                                plane = vecUtils.vecCross( 3, zVec, yVec );
+                                        else
+                                                plane = vecUtils.vecCross( 3, xVec, yVec );
+                                        break;
+                                        break;
+
+                                case 2:
+                                        xDot = Math.abs(vecUtils.vecDot(3, xVec, viewDir));
+                                        yDot = Math.abs(vecUtils.vecDot(3, yVec, viewDir));
+
+                                        if(xDot > yDot)
+                                                plane = vecUtils.vecCross( 3, yVec, zVec );
+                                        else
+                                                plane = vecUtils.vecCross( 3, xVec, zVec );
+                                        break;
+                        }
 
-            var plane;
-            if(xDot > yDot)
-            {
-                plane = xVec;
-            }
-            else
-            {
-                plane = yVec;
-            }
+                        if (localMode)  plane = MathUtils.transformVector( plane, objMat );
 
             // The translation value is a point on the plane
             this.pushViewportObj( elt );
diff --git a/js/stage/stage-view.reel/stage-view.css b/js/stage/stage-view.reel/stage-view.css
index e2c4bb0e..8afb52a2 100755
--- a/js/stage/stage-view.reel/stage-view.css
+++ b/js/stage/stage-view.reel/stage-view.css
@@ -17,29 +17,20 @@
   cursor:text;
 }
 
-.codeViewContainer>div{
-    width:2500px;/*to prevent scrolling of editor container in the middle of the page for short files*/
+.codeViewContainer .CodeMirror {
+    width: 100%;
+    height: 100%;
+    background: white;
 }
 
-/* OLD CSS for reference
-#mainContent #codeMirror_1 {
-    height:100%;
+.codeViewContainer .CodeMirror-scroll {
+    height: 100%;
+    overflow: auto;
 }
-*/
-
-/*.CodeMirror {*/
-    /*width: 100%;*/
-    /*height: 100%;*/
-    /*background: white;*/
-/*}*/
-