1 files changed, 132 insertions, 198 deletions

diff --git a/js/tools/ZoomTool.js b/js/tools/ZoomTool.js
index a285db0f..0bcba2a3 100755
--- a/js/tools/ZoomTool.js
+++ b/js/tools/ZoomTool.js
@@ -34,7 +34,6 @@ var Montage = require("montage/core/core").Montage,
     snapManager = require("js/helper-classes/3D/snap-manager").SnapManager,
     viewUtils = require("js/helper-classes/3D/view-utils").ViewUtils,
     vecUtils = require("js/helper-classes/3D/vec-utils").VecUtils,
-    drawUtils = require("js/helper-classes/3D/draw-utils").DrawUtils,
     DrawingTool = require("js/tools/drawing-tool").DrawingTool;
 
 exports.ZoomTool = Montage.create(DrawingTool, {
@@ -53,13 +52,11 @@ exports.ZoomTool = Montage.create(DrawingTool, {
 
 
     HandleLeftButtonDown: {
-        value : function (event) {
-
+        value: function(event) {
             NJevent("enableStageMove");
-            this._isDrawing=true;
+            this._isDrawing = true;
 
-            var point = webkitConvertPointFromPageToNode(this.application.ninja.stage.canvas,
-                                                        new WebKitPoint(event.pageX, event.pageY));
+            var point = webkitConvertPointFromPageToNode(this.application.ninja.stage.canvas, new WebKitPoint(event.pageX, event.pageY));
             this.downPoint.x = point.x;
             this.downPoint.y = point.y;
         }
@@ -67,40 +64,36 @@ exports.ZoomTool = Montage.create(DrawingTool, {
 
     HandleAltKeyDown: {
         value: function(event) {
-
          this.setCursor();
-         this._altKeyDown=true;
-
+         this._altKeyDown = true;
         }
     },
 
     HandleAltKeyUp: {
         value: function(event) {
-
          this.setCursor();
-         this._altKeyDown=false;
+         this._altKeyDown = false;
         }
     },
 
     HandleEscape: {
         value: function(event) {
             this.application.ninja.stage.clearDrawingCanvas();
-            this._escPressed=false;
+            this._escPressed = false;
         }
     },
 
     Configure: {
         value: function(wasSelected) {
-
-            if(this.options.selectedElement==="zoomOutTool"){
+            if(this.options.selectedElement === "zoomOutTool") {
                 var cursor = "url('images/cursors/zoom_minus.png'), default";
                 this.application.ninja.stage.drawingCanvas.style.cursor = cursor;
             }
-           if(wasSelected) {
+
+            if(wasSelected) {
                 this.AddCustomFeedback();
-                this.eventManager.addEventListener( "toolDoubleClick", this, false);
+                this.eventManager.addEventListener("toolDoubleClick", this, false);
                 this.application.ninja.stage.drawingCanvas.addEventListener("mousewheel", this, false);
-
            } else {
                 this.RemoveCustomFeedback();
                 this.eventManager.removeEventListener( "toolDoubleClick", this, false);
@@ -110,87 +103,76 @@ exports.ZoomTool = Montage.create(DrawingTool, {
     },
 
     AddCustomFeedback: {
-        value: function (event) {
-
+        value: function(event) {
             this.application.ninja.stage.canvas.addEventListener("mousewheel", this, false);
-
         }
     },
 
-    handleScrollValue:{
-       value:function(){
-
+    handleScrollValue: {
+       value: function() {
            this._mode = "mouseWheelZoom";
-           this._zoomFactor= this.application.ninja.documentBar.zoomFactor/100;
+           this._zoomFactor = this.application.ninja.documentBar.zoomFactor/100;
 
            if(this._delta > 0){
                  this._zoomFactor *= 1.2;
-           }
-           else{
+           } else{
                  this._zoomFactor /= 1.2;
            }
+
            this._zoomFactor = this.checkZoomLimit(this._zoomFactor);
            this._setZoom(this._mode,this._zoomFactor);
-           this._mode="modeReset";
-
+           this._mode = "modeReset";
        }
     },
 
-    handleMousewheel :{
-        value:function(event){
-
-           var point = webkitConvertPointFromPageToNode(this.application.ninja.stage.canvas,
-                                                        new WebKitPoint(event.pageX, event.pageY));
+    handleMousewheel: {
+        value: function(event) {
+            var point = webkitConvertPointFromPageToNode(this.application.ninja.stage.canvas, new WebKitPoint(event.pageX, event.pageY));
             this._layerX = point.x;
             this._layerY = point.y;
 
-           this._delta = 0;
+            this._delta = 0;
 
-           if (event.wheelDelta) {
-                    this._delta = event.wheelDelta/120;
-           }
+            if(event.wheelDelta) {
+                this._delta = event.wheelDelta/120;
+            }
 
-           if (this._delta){
-                    this.handleScrollValue(this._delta);
-           }
+            if(this._delta) {
+                this.handleScrollValue(this._delta);
+            }
 
-           if (event.preventDefault)
-                    event.preventDefault();
-           event.returnValue = false;
+            if(event.preventDefault) {
+                event.preventDefault();
+            }
 
+            event.returnValue = false;
         }
     },
 
-    HandleMouseMove:
-    {
-        value : function (event)
-        {
-            var point = webkitConvertPointFromPageToNode(this.application.ninja.stage.canvas,
-                                                                    new WebKitPoint(event.pageX, event.pageY));
+    HandleMouseMove: {
+        value: function(event) {
+            var point = webkitConvertPointFromPageToNode(this.application.ninja.stage.canvas, new WebKitPoint(event.pageX, event.pageY));
             // check for some reasonable amount of mouse movement
             var dx = Math.abs(point.x - this.downPoint.x),
                 dy = Math.abs(point.y - this.downPoint.y);
 
-            if ((dx >= 10) || (dy >= 10))
-            {
+            if ((dx >= 10) || (dy >= 10)) {
                 // Drawing the Marquee
-                if(this.options.selectedElement==="zoomInTool")
-                {
-                    if(this._altKeyDown)
+                if(this.options.selectedElement === "zoomInTool") {
+                    if(this._altKeyDown) {
                         this._hasDraw=false;
-                    else
+                    } else {
                         this._hasDraw = true;
-                }
-                else
-                {
-                    if(this._altKeyDown)
+                    }
+                } else {
+                    if(this._altKeyDown) {
                         this._hasDraw=true;
-                    else
+                    } else {
                         this._hasDraw=false;
+                    }
                 }
 
-                if(this._hasDraw)
-                {
+                if(this._hasDraw) {
                     this.doDraw(event);
                     this._x = this.downPoint.x;
                     this._y = this.downPoint.y;
@@ -199,50 +181,36 @@ exports.ZoomTool = Montage.create(DrawingTool, {
         }
     },
 
-    handleZoomChange:
-    {
-        value: function(event)
-        {
-        }
-    },
-
-    _setZoom:{
-        value:function(mode,zoomFactor)
-        {
+    _setZoom: {
+        value: function(mode,zoomFactor) {
             var userContent = this.application.ninja.currentDocument.model.documentRoot;
             this._oldValue = this.application.ninja.documentBar.zoomFactor;
 
-            var globalPt;
-            if(this._mode==="mouseClickZoom")
-            {
-                if(this.options.selectedElement==="zoomInTool")
-                {
-                    if(this._altKeyDown)
+            var globalPt, localPt, w, h;
+            if(this._mode === "mouseClickZoom") {
+                if(this.options.selectedElement === "zoomInTool") {
+                    if(this._altKeyDown) {
                         this._factor = this._oldValue/(zoomFactor*100);