Merge branch 'master' into brushtool

5 files changed, 49 insertions, 10 deletions

diff --git a/js/tools/LineTool.js b/js/tools/LineTool.js
index 233316a5..0a7c0534 100755
--- a/js/tools/LineTool.js
+++ b/js/tools/LineTool.js
@@ -42,7 +42,10 @@ exports.LineTool = Montage.create(ShapeTool, {
             }
 
             this._strokeSize = ShapesController.GetValueInPixels(this.options.strokeSize.value, this.options.strokeSize.units, null);
-            this._strokeColor = this.application.ninja.colorController.colorToolbar.stroke.color.css;
+                        if (this.application.ninja.colorController.colorToolbar.stroke.color)
+                                this._strokeColor = this.application.ninja.colorController.colorToolbar.stroke.color.css;
+                        else
+                                this._strokeColor = [0,0,0,1];
             this.startDraw(event);
         }
     },
diff --git a/js/tools/PanTool.js b/js/tools/PanTool.js
index 71301d46..0537a27b 100755
--- a/js/tools/PanTool.js
+++ b/js/tools/PanTool.js
@@ -81,6 +81,14 @@ exports.PanTool = Montage.create(toolBase,
                         {
                 this._altKeyDown = true;
             }
+                        else if (event.shiftKey)
+                        {
+                                if (!this._shiftKeyDown)
+                                {
+                                                this._shiftKeyDown = true;
+                                                this._shiftPt = this._lastGPt.slice();
+                                }
+                        }
         }
     },
 
@@ -90,6 +98,10 @@ exports.PanTool = Montage.create(toolBase,
                         {
                 this._altKeyDown = false;
             }
+                        else if (event.keyCode === Keyboard.SHIFT)
+                        {
+                                this._shiftKeyDown = false;
+                        }
         }
     },
 
@@ -221,6 +233,7 @@ exports.PanTool = Montage.create(toolBase,
                                         var tmpLocal   = MathUtils.transformAndDivideHomogeneousPoint( this._globalPt, globalToLocalMat );
 
                                         this._lastGPt = this._globalPt.slice();
+                                        this._shiftPt = this._lastGPt.slice();
                                         this._lastY = this._lastGPt[1];
 
                                         // set up the matrices we will be needing
@@ -285,6 +298,16 @@ exports.PanTool = Montage.create(toolBase,
                                         this._globalPt[2] += dy;
                                         gPt = [this._lastGPt[0], this._lastGPt[1], this._globalPt[2]];
                                 }
+                                else if (this._shiftKeyDown)
+                                {
+                                        var dx = Math.abs( this._shiftPt[0] - gPt[0] ),
+                                                dy = Math.abs( this._shiftPt[1] - gPt[1] );
+
+                                        if (dx >= dy)
+                                                gPt[1] = this._shiftPt[1];
+                                        else
+                                                gPt[0] = this._shiftPt[0];
+                                }
 
                                 // update the scrollbars
                                 var deltaGPt = VecUtils.vecSubtract(2, gPt, this._lastGPt);
diff --git a/js/tools/Rotate3DToolBase.js b/js/tools/Rotate3DToolBase.js
index aa91b2f4..b04e8b0a 100755
--- a/js/tools/Rotate3DToolBase.js
+++ b/js/tools/Rotate3DToolBase.js
@@ -447,16 +447,13 @@ exports.Rotate3DToolBase = Montage.create(ModifierToolBase, {
                 iMat;
             for(var i = 0; i < len; i++)
             {
-                // Reset to the identity matrix but retain the rotation values
+                // Reset to the identity matrix
                 item = this._targets[i];
-                elt = item.elt;
-
-                // Reset to the identity matrix but retain the translation values
                 iMat = Matrix.I(4);
                 mat = item.mat;
-                iMat[12] = mat[12];
-                iMat[13] = mat[13];
-                iMat[14] = mat[14];
+//                iMat[12] = mat[12];
+//                iMat[13] = mat[13];
+//                iMat[14] = mat[14];
 
                 dist = this._undoArray[i].dist;
 
diff --git a/js/tools/SelectionTool.js b/js/tools/SelectionTool.js
index 37029e8c..caa9e8d6 100755
--- a/js/tools/SelectionTool.js
+++ b/js/tools/SelectionTool.js
@@ -305,16 +305,33 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, {
                     newHeight.push(_h + "px");
 
                     viewUtils.setMatrixForElement(elt, previousMat);
+
+                    this._targets[i].mat = previousMat;
+                    this._targets[i].matInv = glmat4.inverse(previousMat, []);
                 }
             }
             if(addToUndoStack)
             {
-                ElementsMediator.setProperties(this.application.ninja.selectedElements,
+                // if we have a delta, that means the transform handles were used and
+                // we should update the width and height too.  Otherwise, just update left and top.
+                if(this._delta)
+                {
+                    ElementsMediator.setProperties(this.application.ninja.selectedElements,
                                                 { "left": newLeft, "top": newTop, "width": newWidth, "height": newHeight },
                                                 "Change",
                                                 "selectionTool",
                                                 { "left" : previousLeft, "top" : previousTop, "width": previousWidth, "height": previousHeight}
                                               );
+                }
+                else
+                {
+                    ElementsMediator.setProperties(this.application.ninja.selectedElements,
+                                                { "left": newLeft, "top": newTop },
+                                                "Change",
+                                                "selectionTool",
+                                                { "left" : previousLeft, "top" : previousTop }
+                                              );
+                }
             }
             // Save previous value for undo/redo
             this._undoArray = [];
diff --git a/js/tools/Translate3DToolBase.js b/js/tools/Translate3DToolBase.js
index cbf76830..3d9191da 100755
--- a/js/tools/Translate3DToolBase.js
+++ b/js/tools/Translate3DToolBase.js
@@ -85,7 +85,6 @@ exports.Translate3DToolBase = Montage.create(ModifierToolBase,
             {
                 // Reset to the identity matrix but retain the rotation values
                 item = this._targets[i];
-                elt = item.elt;
                 mat = item.mat.slice(0);
                 mat[12] = 0;
                 mat[13] = 0;