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/helper-classes/3D/Rectangle.js b/js/helper-classes/3D/Rectangle.js
index 1922bd91..15f812ab 100755
--- a/js/helper-classes/3D/Rectangle.js
+++ b/js/helper-classes/3D/Rectangle.js
@@ -67,7 +67,7 @@ var Rectangle = exports.Rectangle = Object.create(Object.prototype, {
     getHeight: { value: function()        {  return this.m_height;                    } },
     setHeight: { value: function(h)       {  this.m_height = h;                       } },
 
-        geomType: { value: function()           {  return this.GEOM_TYPE_RECTANGLE;                     } },
+    geomType: { value: function()       {  return this.GEOM_TYPE_RECTANGLE;         } },
 
     ///////////////////////////////////////////////////////////////////////
     // Methods
@@ -84,7 +84,7 @@ var Rectangle = exports.Rectangle = Object.create(Object.prototype, {
         }
     },
 
-        dup: {
+    dup: {
         value: function()
         {
             var rtnRec = Object.create(Rectangle, {});
@@ -122,7 +122,7 @@ var Rectangle = exports.Rectangle = Object.create(Object.prototype, {
         }
     },
 
-        setToBounds: {
+    setToBounds: {
         value: function( bounds )
         {
             var pt = bounds[0];
@@ -166,7 +166,7 @@ var Rectangle = exports.Rectangle = Object.create(Object.prototype, {
         }
     },
 
-        getQuadrant: {
+    getQuadrant: {
         value: function( iQuad )
         {
             // quadrant ordering starts at upper left and continues around counter-clockwise
@@ -220,7 +220,7 @@ var Rectangle = exports.Rectangle = Object.create(Object.prototype, {
             this.setTop( yMin );    this.setHeight( yMax - yMin );
         }
     },
-    
+
 
     translate: {
         value: function( dx, dy )