13 files changed, 251 insertions, 323 deletions

diff --git a/js/tools/EyedropperTool.js b/js/tools/EyedropperTool.js
index 3d0799e0..1d97d11b 100755
--- a/js/tools/EyedropperTool.js
+++ b/js/tools/EyedropperTool.js
@@ -95,22 +95,19 @@ exports.EyedropperTool = Montage.create(toolBase, {
     },
 
     HandleLeftButtonUp: {
-        value : function (event) {
-            {
-                this._isMouseDown = false;
+        value: function(event) {
+            this._isMouseDown = false;
 
-                if(this._escape)
-                {
-                    this._escape = false;
-                }
+            if(this._escape) {
+                this._escape = false;
+            }
 
-                this._updateColor(this._color, true);
+            this._updateColor(this._color, true);
 
-                this._color = null;
+            this._color = null;
 
-                this._elementUnderMouse = null;
-                this._deleteImageDataCanvas();
-            }
+            this._elementUnderMouse = null;
+            this._deleteImageDataCanvas();
         }
     },
 
@@ -237,8 +234,7 @@ exports.EyedropperTool = Montage.create(toolBase, {
 
                 if(color.mode === "gradient")
                 {
-                    this.application.ninja.colorController.colorModel["gradient"] =
-                                    {value: color.color, wasSetByCode: true, type: eventType};
+                    this.application.ninja.colorController.colorModel.gradient = {value: color.color, wasSetByCode: true, type: eventType};
                 }
                 else
                 {
@@ -253,7 +249,7 @@ exports.EyedropperTool = Montage.create(toolBase, {
                     }
                     else
                     {
-                        this.application.ninja.colorController.colorModel["rgb"] = color.color;
+                        this.application.ninja.colorController.colorModel.rgb = color.color;
                     }
                 }
 
diff --git a/js/tools/FillTool.js b/js/tools/FillTool.js
index 16a6f464..2c783cb6 100755
--- a/js/tools/FillTool.js
+++ b/js/tools/FillTool.js
@@ -77,13 +77,12 @@ exports.FillTool = Montage.create(ModifierToolBase, {
     },
 
     HandleLeftButtonUp: {
-        value : function () {
-            //if(this._isDrawing)
-            {
+        value: function() {
+            //if(this._isDrawing) {
                 this.application.ninja.stage.clearDrawingCanvas();
                 this._hasDraw = false;
                 this._isDrawing = false;
-            }
+            //}
         }
     },
 
diff --git a/js/tools/InkBottleTool.js b/js/tools/InkBottleTool.js
index c4197e77..68e7d107 100755
--- a/js/tools/InkBottleTool.js
+++ b/js/tools/InkBottleTool.js
@@ -77,13 +77,12 @@ exports.InkBottleTool = Montage.create(ModifierToolBase, {
     },
 
     HandleLeftButtonUp: {
-        value : function () {
-            //if(this._isDrawing)
-            {
+        value: function() {
+            //if(this._isDrawing) {
                 this.application.ninja.stage.clearDrawingCanvas();
                 this._hasDraw = false;
                 this._isDrawing = false;
-            }
+            //}
         }
     },
 
diff --git a/js/tools/PanTool.js b/js/tools/PanTool.js
index 374886e8..cab25726 100755
--- a/js/tools/PanTool.js
+++ b/js/tools/PanTool.js
@@ -95,12 +95,9 @@ exports.PanTool = Montage.create(toolBase,
         }
     },
 
-    HandleLeftButtonUp:
-    {
-        value : function ( event )
-        {
-            //if(this._isDrawing)
-            {
+    HandleLeftButtonUp: {
+        value: function(event) {
+            //if(this._isDrawing) {
                 // do one final mouse move to update the scrollbars
                 this.mouseUp( event );
 
@@ -108,7 +105,7 @@ exports.PanTool = Montage.create(toolBase,
                 this._hasDraw = false;
                 this._isDrawing = false;
                 this.isDrawing = false;
-            }
+            //}
         }
     },
 
@@ -234,11 +231,10 @@ exports.PanTool = Montage.create(toolBase,
     },
 
 
-    doMouseDown:
-    {
-        value: function( point )
-        {
+    doMouseDown: {
+        value: function(point) {
             //var tmpPt, tmpPt2, tmpPt3, tmpPt4, tmpMat, tmpMat2;   // DEBUG. (see use of these points below)
+            var cop;
             var hitRec = snapManager.snap( point.x, point.y, true );
             if (hitRec)
             {
@@ -260,7 +256,7 @@ exports.PanTool = Montage.create(toolBase,
                     {
                         var localPt = hitRec.calculateElementWorldPoint();
                         viewUtils.pushViewportObj( userContent );
-                        var cop = viewUtils.getCenterOfProjection();
+                        cop = viewUtils.getCenterOfProjection();
                         this._localPt = [cop[0] + localPt[0],  cop[1] + localPt[1],  localPt[2]];
                         viewUtils.popViewportObj();
                     }
@@ -284,7 +280,7 @@ exports.PanTool = Montage.create(toolBase,
 
                     // get a matrix from user content world space to the screen
                     viewUtils.pushViewportObj( userContent );
-                    var cop = viewUtils.getCenterOfProjection();
+                    cop = viewUtils.getCenterOfProjection();
                     var pDist = viewUtils.getPerspectiveDistFromElement(userContent);
                     var projMat = glmat4.scale(Matrix.I(4), [pDist,pDist,pDist], []);
                     projMat[11] = -1;
diff --git a/js/tools/PenTool.js b/js/tools/PenTool.js
index 4b4fd227..a44438ac 100755
--- a/js/tools/PenTool.js
+++ b/js/tools/PenTool.js
@@ -302,6 +302,7 @@ exports.PenTool = Montage.create(ShapeTool, {
     HandleLeftButtonDown:
     {
         value: function (event) {
+            var newAnchor;
             //ignore any right or middle clicks
             if (event.button !== 0) {
                 //todo NOTE: this will work on Webkit only...IE has different codes (left: 1, middle: 4, right: 2)
@@ -427,7 +428,7 @@ exports.PenTool = Montage.create(ShapeTool, {
 
                 } else {
                     this._selectedSubpath.addAnchor(new AnchorPoint());
-                    var newAnchor = this._selectedSubpath.getAnchor(this._selectedSubpath.getSelectedAnchorIndex());
+                    newAnchor = this._selectedSubpath.getAnchor(this._selectedSubpath.getSelectedAnchorIndex());
                     newAnchor.setPos(stageWorldMousePos[0], stageWorldMousePos[1], stageWorldMousePos[2]);
                     newAnchor.setPrevPos(stageWorldMousePos[0], stageWorldMousePos[1], stageWorldMousePos[2]);
                     newAnchor.setNextPos(stageWorldMousePos[0], stageWorldMousePos[1], stageWorldMousePos[2]);
@@ -489,7 +490,7 @@ exports.PenTool = Montage.create(ShapeTool, {
                         if (numAnchors>1 && !this._selectedSubpath.getIsClosed() && this._selectedSubpath.getSelectedAnchorIndex()===0 && prevSelectedAnchorIndex === numAnchors-1){
                             //insert an anchor temporarily that will get removed in the mouse up handler
                             this._selectedSubpath.addAnchor(new AnchorPoint());
-                            var newAnchor = this._selectedSubpath.getAnchor(this._selectedSubpath.getSelectedAnchorIndex());
+                            newAnchor = this._selectedSubpath.getAnchor(this._selectedSubpath.getSelectedAnchorIndex());
                             newAnchor.setPos(localMousePos[0], localMousePos[1], localMousePos[2]);
                             newAnchor.setPrevPos(localMousePos[0], localMousePos[1], localMousePos[2]);
                             newAnchor.setNextPos(localMousePos[0], localMousePos[1], localMousePos[2]);
@@ -534,7 +535,7 @@ exports.PenTool = Montage.create(ShapeTool, {
                         ) {
                         if (!this._selectedSubpath.getIsClosed()) { //todo this test is probably unnecessary, but doing it to be safe
                             this._selectedSubpath.addAnchor(new AnchorPoint());
-                            var newAnchor = this._selectedSubpath.getAnchor(this._selectedSubpath.getSelectedAnchorIndex());
+                            newAnchor = this._selectedSubpath.getAnchor(this._selectedSubpath.getSelectedAnchorIndex());
 
                             newAnchor.setPos(localMousePos[0], localMousePos[1], localMousePos[2]);
                             newAnchor.setPrevPos(localMousePos[0], localMousePos[1], localMousePos[2]);
@@ -564,6 +565,7 @@ exports.PenTool = Montage.create(ShapeTool, {
     HandleMouseMove:
     {
         value: function (event) {
+            var cursor;