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

diff --git a/js/lib/rdge/materials/material.js b/js/lib/rdge/materials/material.js
index a7183187..6cfc4eb4 100755
--- a/js/lib/rdge/materials/material.js
+++ b/js/lib/rdge/materials/material.js
@@ -39,156 +39,156 @@ var Material = function GLMaterial( world ) {
     ///////////////////////////////////////////////////////////////////////
     // Instance variables
     ///////////////////////////////////////////////////////////////////////
-        this._name = "GLMaterial";
-        this._shaderName = "undefined";
+    this._name = "GLMaterial";
+    this._shaderName = "undefined";
 
-        this._time = 0.0;
-        this._dTime = 0.01;
+    this._time = 0.0;
+    this._dTime = 0.01;
 
-        // keep a reference to the owning GLWorld
-        this._world = null;
+    // keep a reference to the owning GLWorld
+    this._world = null;
     if(world) {
         this._world = world;
     }
 
-        this._glTextures = [];          // indexed by uniform name
+    this._glTextures = [];      // indexed by uniform name
 
-        // vertex deformation variables
-        this._hasVertexDeformation = false;
-        this._vertexDeformationRange = [0, 0, 1, 1];    // (xMin, yMin, xMax, yMax)
+    // vertex deformation variables
+    this._hasVertexDeformation = false;
+    this._vertexDeformationRange = [0, 0, 1, 1];    // (xMin, yMin, xMax, yMax)
         this._vertexDeformationTolerance = 0.02;
 
-        // RDGE variables
-        this._shader = null;
-        this._materialNode = null;
+    // RDGE variables
+    this._shader = null;
+    this._materialNode = null;
 
 
     ///////////////////////////////////////////////////////////////////////
     // Property Accessors
     ///////////////////////////////////////////////////////////////////////
 
-        this.setName = function(n) {
+    this.setName = function(n) {
         this._name = n;
     };
 
-        this.getName = function() {
+    this.getName = function() {
         return this._name;
     };
 
-        this.setShaderName = function(n) {
+    this.setShaderName = function(n) {
         this._shaderName = n;
     };
 
-        this.getShaderName = function() {
+    this.getShaderName = function() {
         return this._shaderName;
     };
 
-        this.setWorld = function(world) {
+    this.setWorld = function(world) {
         this._world = world;
     };
 
-        this.getWorld = function() {
+    this.getWorld = function() {
         return this._world;
     };
 
-        this.getShader = function() {
+    this.getShader = function() {
         return this._shader;
     };
 
-        this.getMaterialNode = function() {
+    this.getMaterialNode = function() {
         return this._materialNode;
     };
 
-        // a material can be animated or not. default is not.  
-        // Any material needing continuous rendering should override this method
-        this.isAnimated = function() {
+    // a material can be animated or not. default is not.
+    // Any material needing continuous rendering should override this method
+    this.isAnimated = function() {
         return false;
     };
 
-        this.getTechniqueName   = function() {
-                return 'default'
-        };
+    this.getTechniqueName   = function() {
+        return 'default'
+    };
 
-        // the vertex shader can apply deformations requiring refinement in
-        // certain areas.
-        this.hasVertexDeformation = function()  {
+    // the vertex shader can apply deformations requiring refinement in
+    // certain areas.
+    this.hasVertexDeformation = function()  {
         return this._hasVertexDeformation;
     };
 
-        this.getVertexDeformationRange = function()     {
+    this.getVertexDeformationRange = function() {
         return this._vertexDeformationRange.slice();
     };
 
-        this.getVertexDeformationTolerance = function() {
+    this.getVertexDeformationTolerance = function() {
         return this._vertexDeformationTolerance;
     };
 
     ///////////////////////////////////////////////////////////////////////
     // Common Material Methods
     ///////////////////////////////////////////////////////////////////////
-        this.getProperty = function( propName ) {
-                return this._propValues[propName];
-        };
+    this.getProperty = function( propName ) {
+        return this._propValues[propName];
+    };
 
-        this.getPropertyCount = function() {
-                return this._propNames.length;
-        };
+    this.getPropertyCount = function() {
+        return this._propNames.length;
+    };
 
-        this.getPropertyAtIndex = function( index ) {
-                var rtnArr = [];
-                if ((index < 0) || (index >= this.getPropertyCount())) {
-                        throw new Error( "property index " + index + " is out of range for material" );
+    this.getPropertyAtIndex = function( index ) {
+        var rtnArr = [];
+        if ((index < 0) || (index >= this.getPropertyCount())) {
+            throw new Error( "property index " + index + " is out of range for material" );
         }
 
-                return [ this._propNames[index],  this._propLabels[index],  this._propTypes[index],  this._propValues[index] ];
-        };
+        return [ this._propNames[index],  this._propLabels[index],  this._propTypes[index],  this._propValues[index] ];
+    };
 
-        this.getAllProperties = function( propNames,  propValues,  propTypes,  propLabels) {
-                // clear all the input arrays if there is junk in them
-                propNames.length        = 0;
-                propValues.length       = 0;
-                propTypes.length        = 0;
-                propLabels.length       = 0;
-
-                var nProps = this._propNames.length;
-                for (var i=0;  i<nProps;  i++) {
-                        propNames[i]    = this._propNames[i];
-                        propValues[i]   = this._propValues[this._propNames[i]];
-                        propTypes[i]    = this._propTypes[i];
-                        propLabels[i]   = this._propLabels[i];
-                }
-        };
+    this.getAllProperties = function( propNames,  propValues,  propTypes,  propLabels) {
+        // clear all the input arrays if there is junk in them
+        propNames.length    = 0;
+        propValues.length   = 0;
+        propTypes.length    = 0;
+        propLabels.length   = 0;
+
+        var nProps = this._propNames.length;
+        for (var i=0;  i<nProps;  i++) {
+            propNames[i]    = this._propNames[i];
+            propValues[i]   = this._propValues[this._propNames[i]];
+            propTypes[i]    = this._propTypes[i];
+            propLabels[i]   = this._propLabels[i];
+        }
+    };
 
-        this.hasProperty = function( prop )
-        {
-                var propNames = [],  dummy = [];
-                this.getAllProperties( propNames, dummy, dummy, dummy )
-                for (var i=0;  i<propNames.length;  i++)
-                {
-                        if (prop === propNames[i])  return true;
-                }
-        };
+    this.hasProperty = function( prop )
+    {
+        var propNames = [],  dummy = [];
+        this.getAllProperties( propNames, dummy, dummy, dummy )
+        for (var i=0;  i<propNames.length;  i++)
+        {
+            if (prop === propNames[i])  return true;
+        }
+    };
 
-        this.getPropertyType = function( prop )
-        {
-                var n = this.getPropertyCount();
-                for (var i=0;  i<n;  i++)
-                {
-                        if (prop === this._propNames[i])  return this._propTypes[i];
+    this.getPropertyType = function( prop )
+    {
+        var n = this.getPropertyCount();
+        for (var i=0;  i<n;  i++)
+        {
+            if (prop === this._propNames[i])  return this._propTypes[i];