Expand tabs

1 files changed, 387 insertions, 387 deletions

diff --git a/js/tools/modifier-tool-base.js b/js/tools/modifier-tool-base.js
index 55baecc8..23185989 100755
--- a/js/tools/modifier-tool-base.js
+++ b/js/tools/modifier-tool-base.js
@@ -45,42 +45,42 @@ exports.ModifierToolBase = Montage.create(DrawingTool, {
     //-------------------------------------------------------------------------
     // Snapping-specific properties
     _canSnap: { value: true },
-        _snapParam: { value: null },
-        _snapIndex: { value: -1 },
-        _useQuadPt: { value: false },
+    _snapParam: { value: null },
+    _snapIndex: { value: -1 },
+    _useQuadPt: { value: false },
     _shouldUseQuadPt: { value: false },
 
-        // we set snapping capabilities depending on the tool.
-        // The following variables are set in a tool's initializeSnapping method called on mouse down.
-        _snapToElements: { value: true },
-        _snapToGrid: { value: true },
+    // we set snapping capabilities depending on the tool.
+    // The following variables are set in a tool's initializeSnapping method called on mouse down.
+    _snapToElements: { value: true },
+    _snapToGrid: { value: true },
 
     _clickedObject : {value : null },
     clickedObject:
-        {
-                get: function () {
-                        return this._clickedObject;
-                },
-                set: function (value) {
-                        if(value === this.application.ninja.currentDocument.model.documentRoot)
-                        {
-                                this._clickedObject = this._target;
-                        }
-                        else
-                        {
-                                this._clickedObject = value;
-                        }
-
-                        if(value)
-                        {
-                                this._startMat = viewUtils.getMatrixFromElement(this._clickedObject);
-                        }
-                        else
-                        {
-                                this._startMat = null;
-                        }
-                }
-        },
+    {
+        get: function () {
+            return this._clickedObject;
+        },
+        set: function (value) {
+            if(value === this.application.ninja.currentDocument.model.documentRoot)
+            {
+                this._clickedObject = this._target;
+            }
+            else
+            {
+                this._clickedObject = value;
+            }
+
+            if(value)
+            {
+                this._startMat = viewUtils.getMatrixFromElement(this._clickedObject);
+            }
+            else
+            {
+                this._startMat = null;
+            }
+        }
+    },
     
     _getObjectBeingTracked :
     {
@@ -109,19 +109,19 @@ exports.ModifierToolBase = Montage.create(DrawingTool, {
         value: function(event)
         {
             this._mouseDownHitRec = null;
-                        this._mouseUpHitRec   = null;
+            this._mouseUpHitRec   = null;
 
-                        snapManager.clearAvoidList();
-                        snapManager.clearDragPlane();
+            snapManager.clearAvoidList();
+            snapManager.clearDragPlane();
 
-                        // the translate tool does snap align to the bounds of the object only.
-                        // turn off snap align to the cursor.  This needs to be re-enabled in the mouse up method
-                        snapManager.enableSnapAlign( false );
+            // the translate tool does snap align to the bounds of the object only.
+            // turn off snap align to the cursor.  This needs to be re-enabled in the mouse up method
+            snapManager.enableSnapAlign( false );
 
-                        // snap to element and snap to grid are conditionally enabled based
-                        // on the snap results of the mouse down.  enable everything for the first snap
-                        this._snapToElements = snapManager.elementSnapEnabledAppLevel();
-                        this._snapToGrid = snapManager.gridSnapEnabledAppLevel();
+            // snap to element and snap to grid are conditionally enabled based
+            // on the snap results of the mouse down.  enable everything for the first snap
+            this._snapToElements = snapManager.elementSnapEnabledAppLevel();
+            this._snapToGrid = snapManager.gridSnapEnabledAppLevel();
 
             this._dragPlane = null;
             var do3DSnap = true;
@@ -132,8 +132,8 @@ exports.ModifierToolBase = Montage.create(DrawingTool, {
 //                {
 //                    this.doSelection(event);
 
-                    snapManager.enableElementSnap       ( true  );
-//                    snapManager.enableGridSnap                ( true  );
+                    snapManager.enableElementSnap   ( true  );
+//                    snapManager.enableGridSnap        ( true  );
 //                }
 //            }
 //            else
@@ -152,9 +152,9 @@ exports.ModifierToolBase = Montage.create(DrawingTool, {
             {
                 var point = webkitConvertPointFromPageToNode(this.application.ninja.stage.canvas,
                                                                 new WebKitPoint(event.pageX, event.pageY));
-                                // do the snap before setting up the avoid list to allow
-                                // a snap on the mouse down
-                                var hitRec = snapManager.snap(point.x, point.y, do3DSnap);
+                // do the snap before setting up the avoid list to allow
+                // a snap on the mouse down
+                var hitRec = snapManager.snap(point.x, point.y, do3DSnap);
 
                 // TODO - Check that hitRec's element matches element that browser says we clicked on
                 var elt = this.application.ninja.stage.getElement(event, true);
@@ -168,21 +168,21 @@ exports.ModifierToolBase = Montage.create(DrawingTool, {
                     snapManager.addToAvoidList(element);
                 });
 
-                                if (hitRec)
-                                {
-                                        // disable snap attributes
-                                        if (hitRec.getType() == hitRec.SNAP_TYPE_ELEMENT)
-                                        {
-                                                this._snapToElements = false;
-                                                this._snapToGrid = false;
-                                        }
-                                        else if (hitRec.getType() == hitRec.SNAP_TYPE_ELEMENT_CENTER)
-                                        {
-                                                snapManager.enableSnapAlign( snapManager.snapAlignEnabledAppLevel() );
-                                        }
-
-                                        // parameterize the snap point on the target
-                                        this._snapParam = this.parameterizeSnap( hitRec );
+                if (hitRec)
+                {
+                    // disable snap attributes
+                    if (hitRec.getType() == hitRec.SNAP_TYPE_ELEMENT)
+                    {
+                        this._snapToElements = false;
+                        this._snapToGrid = false;
+                    }
+                    else if (hitRec.getType() == hitRec.SNAP_TYPE_ELEMENT_CENTER)
+                    {
+                        snapManager.enableSnapAlign( snapManager.snapAlignEnabledAppLevel() );
+                    }
+
+                    // parameterize the snap point on the target
+                    this._snapParam = this.parameterizeSnap( hitRec );
 
                     if(!this._dragPlane)
                     {
@@ -201,20 +201,20 @@ exports.ModifierToolBase = Montage.create(DrawingTool, {
                     var sign = MathUtils.fpSign( vecUtils.vecDot(3,this._dragPlane,[0,0,1]) + this._dragPlane[3] - 1.0);
                     this._shouldUseQuadPt = (sign == 0)
 
-                                        var wpHitRec = hitRec.convertToWorkingPlane( this._dragPlane );
-                                        this._mouseDownHitRec = wpHitRec;
-                                        this._mouseUpHitRec = null;
+                    var wpHitRec = hitRec.convertToWorkingPlane( this._dragPlane );
+                    this._mouseDownHitRec = wpHitRec;
+                    this._mouseUpHitRec = null;
 
-                                        var pt = hitRec.getScreenPoint();
-                                        this.downPoint.x = pt[0];
-                                        this.downPoint.y = pt[1];
+                    var pt = hitRec.getScreenPoint();
+                    this.downPoint.x = pt[0];
+                    this.downPoint.y = pt[1];
 
                     snapManager.drawLastHit();
 
                     snapManager.enableSnapAlign( snapManager.snapAlignEnabledAppLevel() );
                     snapManager.enableElementSnap( snapManager.elementSnapEnabledAppLevel() );
                     snapManager.enableGridSnap( snapManager.gridSnapEnabledAppLevel() );
-                                }
+                }
             }
             else
             {
@@ -223,18 +223,18 @@ exports.ModifierToolBase = Montage.create(DrawingTool, {
         }
     },
     
-        /*
-         *  The parameterization is based on the position of the
-         *  snap point in pre-transformed element screen space
-         */
-        parameterizeSnap:
-        {
-                value: function( hitRec )
-                {
-                        var paramPt = [0,0,0];
+    /*
+     *  The parameterization is based on the position of the
+     *  snap point in pre-transformed element screen space
+     */
+    parameterizeSnap:
+    {
+        value: function( hitRec )
+        {
+            var paramPt = [0,0,0];
             var elt = this._getObjectBeingTracked(hitRec);
-                        if (elt)
-                        {
+            if (elt)
+            {
                 this.clickedObject = elt;
 
                 var worldPt = hitRec.calculateStageWorldPoint();
@@ -246,176 +246,176 @@ exports.ModifierToolBase = Montage.create(DrawingTool, {
                     var scrPt = MathUtils.transformHomogeneousPoint( worldPt, invMat );