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

Conflicts:
	js/helper-classes/3D/StageLine.js

1 files changed, 316 insertions, 316 deletions

diff --git a/js/tools/PanTool.js b/js/tools/PanTool.js
index 6b3dbdbb..28e4c04d 100755
--- a/js/tools/PanTool.js
+++ b/js/tools/PanTool.js
@@ -38,33 +38,33 @@ var Montage = require("montage/core/core").Montage,
 
 exports.PanTool = Montage.create(toolBase,
 {
-        _localPt :{value: [0,0] , writable:true},
-        _worldPt :{value: [0,0] , writable:true},
-        _globalPt :{value: [0,0] , writable:true},
-        _globalToUCWorld :{value: [] , writable:true},
-        _lastGPt :{value: [0,0], writable:true},
-        _lastY :{value: 0, writable:true},
+    _localPt :{value: [0,0] , writable:true},
+    _worldPt :{value: [0,0] , writable:true},
+    _globalPt :{value: [0,0] , writable:true},
+    _globalToUCWorld :{value: [] , writable:true},
+    _lastGPt :{value: [0,0], writable:true},
+    _lastY :{value: 0, writable:true},
 
-        _maxHorizontalScroll: {value: 0, writable:true},
-        _maxVerticalScroll: {value: 0, writable:true},
+    _maxHorizontalScroll: {value: 0, writable:true},
+    _maxVerticalScroll: {value: 0, writable:true},
 
     Configure: {
         value: function ( doActivate )
-                {
-                        if (doActivate)
-                        {
-                                NJevent("enableStageMove");
-                                this.eventManager.addEventListener( "toolDoubleClick", this, false);
-                                this.application.ninja.stage.canvas.addEventListener("mousewheel", this, false);
-                                this.activate();
-                        }
-                        else
-                        {
-                                NJevent("disableStageMove");
+        {
+            if (doActivate)
+            {
+                NJevent("enableStageMove");
+                this.eventManager.addEventListener( "toolDoubleClick", this, false);
+                this.application.ninja.stage.canvas.addEventListener("mousewheel", this, false);
+                this.activate();
+            }
+            else
+            {
+                NJevent("disableStageMove");
                 this.eventManager.removeEventListener( "toolDoubleClick", this, false);
-                                this.application.ninja.stage.canvas.removeEventListener("mousewheel", this, false);
-                                this.deactivate();
-                        }
+                this.application.ninja.stage.canvas.removeEventListener("mousewheel", this, false);
+                this.deactivate();
+            }
         }
     },
 
@@ -87,23 +87,23 @@ exports.PanTool = Montage.create(toolBase,
     },
 
     HandleMouseMove:
-        {
+    {
         value : function (event)
-                {
-                        this.mouseMove( event );
-                }
-        },
+        {
+            this.mouseMove( event );
+        }
+    },
 
     HandleLeftButtonUp:
-        {
+    {
         value : function ( event )
-                {
+        {
             //if(this._isDrawing)
-                        {
-                                // do one final mouse move to update the scrollbars
-                                this.mouseUp( event );
-               
-                            this.application.ninja.stage.clearDrawingCanvas();
+            {
+                // do one final mouse move to update the scrollbars
+                this.mouseUp( event );
+
+                this.application.ninja.stage.clearDrawingCanvas();
                 this._hasDraw = false;
                 this._isDrawing = false;
                 this.isDrawing = false;
@@ -114,248 +114,248 @@ exports.PanTool = Montage.create(toolBase,
     HandleKeyPress: {
         value: function(event) {
             if(event.altKey)
-                        {
+            {
                 this._altKeyDown = true;
             }
-                        else if (event.shiftKey)
-                        {
-                                if (!this._shiftKeyDown)
-                                {
-                                                this._shiftKeyDown = true;
-                                                this._shiftPt = this._lastGPt.slice();
-                                }
-                        }
+            else if (event.shiftKey)
+            {
+                if (!this._shiftKeyDown)
+                {
+                        this._shiftKeyDown = true;
+                        this._shiftPt = this._lastGPt.slice();
+                }
+            }
         }
     },
 
     HandleKeyUp: {
         value: function(event) {
             if(event.keyCode === Keyboard.ALT)
-                        {
+            {
                 this._altKeyDown = false;
             }
-                        else if (event.keyCode === Keyboard.SHIFT)
-                        {
-                                this._shiftKeyDown = false;
-                        }
+            else if (event.keyCode === Keyboard.SHIFT)
+            {
+                this._shiftKeyDown = false;
+            }
         }
     },
 
     handleToolDoubleClick:
-        {
+    {
         value: function ()
-                {
-                        var uc = this.application.ninja.currentDocument.model.documentRoot;
-                        var ucMat = viewUtils.getMatrixFromElement(uc);
+        {
+            var uc = this.application.ninja.currentDocument.model.documentRoot;
+            var ucMat = viewUtils.getMatrixFromElement(uc);
 
-                        var noTrans = ucMat.slice();
-                        noTrans[12] = 0;  noTrans[13] = 0;  noTrans[14] = 0;
-                        var ucMatInv = glmat4.inverse( ucMat, [] );
-                        var deltaMat = glmat4.multiply( noTrans, ucMatInv, [] );
+            var noTrans = ucMat.slice();
+            noTrans[12] = 0;  noTrans[13] = 0;  noTrans[14] = 0;
+            var ucMatInv = glmat4.inverse( ucMat, [] );
+            var deltaMat = glmat4.multiply( noTrans, ucMatInv, [] );
 
             this.application.ninja.stage.centerStage();
 
-                        this.applyDeltaMat( deltaMat );
+            this.applyDeltaMat( deltaMat );
         }
     },
 
     handleMousewheel :
-        {
+    {
         value:function(event)
-                {
-                        var zoom = this.application.ninja.documentBar.zoomFactor/100.0;
-                        if (!zoom)  zoom = 1.0;
+        {
+            var zoom = this.application.ninja.documentBar.zoomFactor/100.0;
+            if (!zoom)  zoom = 1.0;
 
-                        var delta = 0;
-                        if (event.wheelDelta)
-                                delta = 10*event.wheelDelta/120;
-                        //console.log( "delta: " + delta );
+            var delta = 0;
+            if (event.wheelDelta)
+                delta = 10*event.wheelDelta/120;
+            //console.log( "delta: " + delta );
 
             this.application.ninja.currentDocument.model.views.design.document.body.scrollLeft += delta;
 
-                        delta *= zoom;
-           
-                        var uc = this.application.ninja.currentDocument.model.documentRoot;
-                        var ucMat = viewUtils.getMatrixFromElement(uc);
-                        var offset = viewUtils.getElementOffset( uc );
-                        //console.log( "uc offset: " + offset[0] );
-
-                        var localToGlobalMat = viewUtils.getLocalToGlobalMatrix( uc );
-                        var globalToLocalMat = glmat4.inverse( localToGlobalMat, []);
-
-                        var w = uc.offsetWidth,
-                                h = uc.offsetHeight;
-                        if(uc.width)
-                                w = uc.width;
-                        if(uc.height)
-                                h = uc.height;
-                        var localPt = [ w/2,  h/2, 0];
-                        var globalPt = MathUtils.transformAndDivideHomogeneousPoint( localPt,  localToGlobalMat );
-                        this.doMouseDown( { x:globalPt[0],  y:globalPt[1] } );
-
-                        globalPt[0] += delta;
-                        this._isDrawing = true;
-                        this.doMouseMove( { x:globalPt[0],  y:globalPt[1] } );
-                        this._isDrawing = false;
+            delta *= zoom;
+
+            var uc = this.application.ninja.currentDocument.model.documentRoot;
+            var ucMat = viewUtils.getMatrixFromElement(uc);
+            var offset = viewUtils.getElementOffset( uc );
+            //console.log( "uc offset: " + offset[0] );
+
+            var localToGlobalMat = viewUtils.getLocalToGlobalMatrix( uc );
+            var globalToLocalMat = glmat4.inverse( localToGlobalMat, []);
+
+            var w = uc.offsetWidth,
+                h = uc.offsetHeight;
+            if(uc.width)
+                w = uc.width;
+            if(uc.height)
+                h = uc.height;
+            var localPt = [ w/2,  h/2, 0];
+            var globalPt = MathUtils.transformAndDivideHomogeneousPoint( localPt,  localToGlobalMat );
+            this.doMouseDown( { x:globalPt[0],  y:globalPt[1] } );
+
+            globalPt[0] += delta;
+            this._isDrawing = true;
+            this.doMouseMove( { x:globalPt[0],  y:globalPt[1] } );
+            this._isDrawing = false;
         }
     },
 
 
-        /////////////////////////////////////////////////////////////////////
-        // Simple tool API
-        activate:
-        {
-                value: function()
+    /////////////////////////////////////////////////////////////////////
+    // Simple tool API
+    activate:
+    {
+