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

diff --git a/js/components/slider.reel/slider.js b/js/components/slider.reel/slider.js
index 57514edb..2b3ebb1a 100755
--- a/js/components/slider.reel/slider.js
+++ b/js/components/slider.reel/slider.js
@@ -150,7 +150,7 @@ var Slider = exports.Slider = Montage.create(SliderBase, {
                 clickPoint = webkitConvertPointFromPageToNode(this.element, new WebKitPoint(offset,pageY)).y;
             }
             this.value = (clickPoint*this._valueCoef)+this._minValue;
-            
+
             if(!this._isMouseDown && (this._previousValue !== this._value))
             {
                 this._dispatchActionEvent();
@@ -197,7 +197,7 @@ var Slider = exports.Slider = Montage.create(SliderBase, {
     draw: {
         value: function() {
             this.setPercentValueFromValue();
-            
+
             if(this._direction === "horizontal")
             {
                 this.knob.style.left = this._percentValue +"%";
@@ -265,7 +265,7 @@ var Slider = exports.Slider = Montage.create(SliderBase, {
             }
 
 
-            
+
 
             if(this._enabled)
             {
@@ -282,8 +282,8 @@ var Slider = exports.Slider = Montage.create(SliderBase, {
                     this.value = this._minValue;
                 }
             }
-            
+
         }
     }
-    
+
 });