Merge branch 'normalize' of https://github.com/kriskowal/ninja-internal

Conflicts:
	js/components/gradientpicker.reel/gradientpicker.js
	js/components/tools-properties/text-properties.reel/text-properties.js
	js/document/views/base.js
	js/document/views/design.js
	js/helper-classes/3D/StageLine.js
	js/helper-classes/3D/draw-utils.js
	js/lib/drawing/world.js
	js/lib/geom/circle.js
	js/lib/geom/line.js
	js/lib/geom/rectangle.js
	js/lib/geom/shape-primitive.js
	js/lib/rdge/materials/bump-metal-material.js
	js/lib/rdge/materials/flag-material.js
	js/lib/rdge/materials/fly-material.js
	js/lib/rdge/materials/julia-material.js
	js/lib/rdge/materials/keleidoscope-material.js
	js/lib/rdge/materials/mandel-material.js
	js/lib/rdge/materials/material.js
	js/lib/rdge/materials/plasma-material.js
	js/lib/rdge/materials/pulse-material.js
	js/lib/rdge/materials/radial-gradient-material.js
	js/lib/rdge/materials/taper-material.js
	js/lib/rdge/materials/twist-vert-material.js
	js/lib/rdge/materials/water-material.js
	js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
	js/panels/Materials/materials-library-panel.reel/materials-library-panel.js
	js/panels/Materials/materials-popup.reel/materials-popup.html
	js/panels/Materials/materials-popup.reel/materials-popup.js
	js/tools/LineTool.js

Signed-off-by: Valerio Virgillito <valerio@motorola.com>

1 files changed, 6 insertions, 6 deletions

diff --git a/js/tools/drawing-tool.js b/js/tools/drawing-tool.js
index 0cbb924f..a7e585e3 100755
--- a/js/tools/drawing-tool.js
+++ b/js/tools/drawing-tool.js
@@ -118,7 +118,7 @@ exports.DrawingTool = Montage.create(ToolBase, {
         value: function (event) {
             var point;
             point = webkitConvertPointFromPageToNode(this.application.ninja.stage.canvas, new WebKitPoint(event.pageX, event.pageY));
-            
+
             if (this.drawingFeedback.mode === "Draw3D") {
                 var do3DSnap;
                 this.application.ninja.stage.clearDrawingCanvas();
@@ -151,15 +151,15 @@ exports.DrawingTool = Montage.create(ToolBase, {
                     this._currentDY = point.y - this._currentY;
 
                     this.downPoint.x += this._currentDX;
-                                this.downPoint.y += this._currentDY;
+                    this.downPoint.y += this._currentDY;
                     this.currentX += this._currentDX;
-                                this.currentY += this._currentDY;
-                    
+                    this.currentY += this._currentDY;
+
                     DrawingToolBase.draw2DRectangle(this.downPoint.x,this.downPoint.y,this.currentX - this.downPoint.x,this.currentY - this.downPoint.y);
                 } else {
                     this._currentX = point.x;
                     this._currentY = point.y;
-               
+
                     DrawingToolBase.draw2DRectangle(this.downPoint.x,this.downPoint.y,point.x - this.downPoint.x,point.y - this.downPoint.y);
                 }
 
@@ -233,7 +233,7 @@ exports.DrawingTool = Montage.create(ToolBase, {
             return DrawingToolBase.getHitRecPos(this.mouseUpHitRec);
         }
     },
-    
+
     getDrawingData: {
         value: function (event) {
             return DrawingToolBase.getCompletePoints(this.mouseDownHitRec, this.mouseUpHitRec);