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, 4 insertions, 4 deletions

diff --git a/js/tools/ToolBase.js b/js/tools/ToolBase.js
index 7f4b6f46..8cc77300 100755
--- a/js/tools/ToolBase.js
+++ b/js/tools/ToolBase.js
@@ -89,7 +89,7 @@ exports.toolBase = Montage.create(Component, {
     HandleShiftKeyUp:   { value : function () {} },
     HandleAltKeyDown:   { value : function () {} },
     HandleAltKeyUp:     { value : function () {} },
-    
+
     HandleSpaceDown:    { value: function() { this._isSpace = true; } },
     HandleSpaceUp:      { value: function() { this._isSpace = false; } },
 
@@ -137,7 +137,7 @@ exports.toolBase = Montage.create(Component, {
 
             previousZoomValue = this.application.ninja.documentBar.zoomFactor;
             upperBoundary = previousZoomValue *1.2 ;
-            
+
             if(upperBoundary > 2000)
                 this.application.ninja.documentBar.zoomFactor = 2000;
             else
@@ -149,7 +149,7 @@ exports.toolBase = Montage.create(Component, {
     zoomOut:{
         value:function(){
             var lowerBoundary ,previousZoomValue;
-            
+
             previousZoomValue = this.application.ninja.documentBar.zoomFactor ;
             lowerBoundary = previousZoomValue/1.2 ;
 
@@ -178,7 +178,7 @@ exports.toolBase = Montage.create(Component, {
 
 //            if (drawUtils.isDrawingGrid())
 //            {
-//                          snapManager.updateWorkingPlaneFromView();
+//              snapManager.updateWorkingPlaneFromView();
 //            }
         }
     },