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

diff --git a/js/helper-classes/3D/draw-utils.js b/js/helper-classes/3D/draw-utils.js
index 617b61ef..5d3a1e2f 100755
--- a/js/helper-classes/3D/draw-utils.js
+++ b/js/helper-classes/3D/draw-utils.js
@@ -42,104 +42,104 @@ var StageLine = require("js/helper-classes/3D/StageLine").StageLine;
 
 var DrawUtils = exports.DrawUtils = Montage.create(Component, {
 
-        ///////////////////////////////////////////////////////////////////////
-        // Instance variables
-        ///////////////////////////////////////////////////////////////////////
+    ///////////////////////////////////////////////////////////////////////
+    // Instance variables
+    ///////////////////////////////////////////////////////////////////////
     viewUtils: { value: null, writable: true },
     snapManager: { value: null },
     ElementPlanes : { value: null, writable: true },
 
-        // the drawing surface (a canvas)
-        _drawingSurfaceElt : { value: null, writable: true },
-        _drawingContext : { value: null, writable: true },
+    // the drawing surface (a canvas)
+    _drawingSurfaceElt : { value: null, writable: true },
+    _drawingContext : { value: null, writable: true },
 
-        // color to draw the lines
-        _lineColor : { value: "black", writable: true},
+    // color to draw the lines
+    _lineColor : { value: "black", writable: true},
 
-        // define a stack for quickly setting graphics states and restoring them
-        _stateArray : { value: [], writable: true },
+    // define a stack for quickly setting graphics states and restoring them
+    _stateArray : { value: [], writable: true },
 
-        // save references to the grid lines for quick redraw
-        _gridLineArray : {value: [], writable: true },
+    // save references to the grid lines for quick redraw
+    _gridLineArray : {value: [], writable: true },
 
-        // state for moveTo, lineTo
-        _curPt : { value: null, writable: true },
-        _curVis : { value: null, writable: true },
+    // state for moveTo, lineTo
+    _curPt : { value: null, writable: true },
+    _curVis : { value: null, writable: true },
 
-        // the element that defines the coordinate system for the displayed lines
-        _sourceSpaceElt  : { value: null, writable: true },
+    // the element that defines the coordinate system for the displayed lines
+    _sourceSpaceElt  : { value: null, writable: true },
 
-        // maintain a list of objects to hide against
-        _eltArray : {value: [], writable: true },
+    // maintain a list of objects to hide against
+    _eltArray : {value: [], writable: true },
 
-        // maintain a list of the planes to test against
-        _planesArray : {value: [], writable: true },
+    // maintain a list of the planes to test against
+    _planesArray : {value: [], writable: true },
 
-        // the working plane.
-        // a grid may be drawn aligned with this working plane
-        _workingPlane : { value: null, writable: true },
+    // the working plane.
+    // a grid may be drawn aligned with this working plane
+    _workingPlane : { value: null, writable: true },
 
-        // save some parameters about the grid.
-        // these parameters are set when the grid is drawn
-        _gridHorizontalSpacing : {value: 50, writable: true },
-        _gridVerticalSpacing : {value: 50, writable: true },
-        _gridHorizontalLineCount : {value:10, writable: true },
-        _gridVerticalLineCount : {value:0, writable: true },
-        _gridOrigin : {value: null, writable: true },
+    // save some parameters about the grid.
+    // these parameters are set when the grid is drawn
+    _gridHorizontalSpacing : {value: 50, writable: true },
+    _gridVerticalSpacing : {value: 50, writable: true },
+    _gridHorizontalLineCount : {value:10, writable: true },
+    _gridVerticalLineCount : {value:0, writable: true },
+    _gridOrigin : {value: null, writable: true },
 
-        drawXY : {value: false, writable: true },
-        drawXZ : {value: false, writable: true },
-        drawYZ : {value: false, writable: true },
+    drawXY : {value: false, writable: true },
+    drawXZ : {value: false, writable: true },
+    drawYZ : {value: false, writable: true },
 
-        drawElementN : {value: false, writable: true },
+    drawElementN : {value: false, writable: true },
 
-        _selectionCtr : {value: null, writable: true },
+    _selectionCtr : {value: null, writable: true },
 
     // Properties that require element planes to be updated
-        _updatePlaneProps : {value: ["matrix", "left", "top", "width", "height"], writable: false },
-        _recalculateScrollOffsets : { value: false },
+    _updatePlaneProps : {value: ["matrix", "left", "top", "width", "height"], writable: false },
+    _recalculateScrollOffsets : { value: false },
 
-        ///////////////////////////////////////////////////////////////////////
-        // Property accessors
-        ///////////////////////////////////////////////////////////////////////
-        setDrawingSurfaceElement : { value: function( s ) {  this._drawingSurfaceElt = s;  if (s)  this._drawingContext = s.getContext("2d");     }},
-        getDrawingSurfaceElement : { value: function()          {  return this._drawingSurfaceElt;      }},
+    ///////////////////////////////////////////////////////////////////////
+    // Property accessors
+    ///////////////////////////////////////////////////////////////////////
+    setDrawingSurfaceElement : { value: function( s ) {  this._drawingSurfaceElt = s;  if (s)  this._drawingContext = s.getContext("2d");     }},
+    getDrawingSurfaceElement : { value: function()          {  return this._drawingSurfaceElt;      }},
 
-        getDrawingContext : { value: function()                 {  return this._drawingContext;                 }},
+    getDrawingContext : { value: function()         {  return this._drawingContext;         }},
 
-        setSourceSpaceElement : { value: function(ss)          {  this._sourceSpaceElt = ss;           }},
-        getSourceSpaceElement : { value: function()            {  return this._sourceSpaceElt;         }},
+    setSourceSpaceElement : { value: function(ss)          {  this._sourceSpaceElt = ss;           }},
+    getSourceSpaceElement : { value: function()            {  return this._sourceSpaceElt;         }},
 
-        getWorkingPlane : { value: function()            {  return this._workingPlane;           }},
-        setWorkingPlane : { value: function (wp)                        { this._workingPlane = wp;                              }},
+    getWorkingPlane : { value: function()            {  return this._workingPlane;           }},
+    setWorkingPlane : { value: function (wp)            { this._workingPlane = wp;              }},
 
-        getGridHorizontalSpacing : { value: function()  {  return this._gridHorizontalSpacing;          }},
-        getGridVerticalSpacing : { value: function()    {  return this._gridVerticalSpacing;            }},
-        getGridHorizontalLineCount : { value: function()        {  return this._gridHorizontalLineCount;        }},
-        getGridVerticalLineCount : { value: function()  {  return this._gridVerticalLineCount;  }},
-        getGridOrigin : { value: function()     {  return this._gridOrigin.slice(0);                    }},
+    getGridHorizontalSpacing : { value: function()  {  return this._gridHorizontalSpacing;      }},
+    getGridVerticalSpacing : { value: function()    {  return this._gridVerticalSpacing;        }},
+    getGridHorizontalLineCount : { value: function()    {  return this._gridHorizontalLineCount;    }},
+    getGridVerticalLineCount : { value: function()  {  return this._gridVerticalLineCount;  }},
+    getGridOrigin : { value: function() {  return this._gridOrigin.slice(0);            }},
 
-        isDrawingGrid : { value: function()                     {  return this.drawXY || this.drawYZ || this.drawXZ;    }},
-        isDrawingElementNormal : { value: function()                    {  return this.drawElementN     }},
+    isDrawingGrid : { value: function()         {  return this.drawXY || this.drawYZ || this.drawXZ;    }},
+    isDrawingElementNormal : { value: function()            {  return this.drawElementN }},
 
-        getLineColor : { value: function()                      {  return this._lineColor;                                      }},
-        setLineColor : { value: function( color )               {  this._lineColor = color;                                     }},
+    getLineColor : { value: function()          {  return this._lineColor;                  }},
+    setLineColor : { value: function( color )       {  this._lineColor = color;                 }},
 
-        getLineWidth : { value: function()                      {  return this._drawingContext.lineWidth;       }},
-        setLineWidth : { value: function( w )                   {  this._drawingContext.lineWidth = w;          }},
+    getLineWidth : { value: function()          {  return this._drawingContext.lineWidth;   }},
+    setLineWidth : { value: function( w )           {  this._drawingContext.lineWidth = w;      }},
 
 
-        initialize: {
-                value: function() {
-                        this._gridOrigin = [0,0];       // 2D plane space point
+    initialize: {
+        value: function() {
+            this._gridOrigin = [0,0];   // 2D plane space point
 
             this.eventManager.addEventListener("elementAdded", this, false);
             this.eventManager.addEventListener("elementsRemoved", this, false);
             this.eventManager.addEventListener("elementChange", this, false);
             this.eventManager.addEventListener("elementChanging", this, false);
             this.eventManager.addEventListener("elementReplaced", this, false);
-                }
-        },
+        }
+    },
 
     initializeFromDocument:{
         value:function(adjustScrollOffsets, useStageValues){
@@ -364,503 +364,503 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
         }
     },
 
-        ///////////////////////////////////////////////////////////////////////
-        // Methods
-        ///////////////////////////////////////////////////////////////////////
-
-        addElement: {
-                value: function( elt ) {
-                        // check if we already know about this object
-                        var n = this._eltArray.length;
-                        for (var i=0;  i<n;  i++) {
-                                if (elt == this._eltArray[i]) {
-                                        return;
-                                }
-                        }
-
-                        this._eltArray.push( elt );
-
-                        // create the planes for this element
-                        var plane = Object.create(this.ElementPlanes, {});
-                        plane.setElement( elt );
-                        plane.init();
+    ///////////////////////////////////////////////////////////////////////
+    // Methods
+    ///////////////////////////////////////////////////////////////////////
+
+    addElement: {
+        value: function( elt ) {
+            // check if we already know about this object
+            var n = this._eltArray.length;
+            for (var i=0;  i<n;  i++) {
+                if (elt == this._eltArray[i]) {
+                    return;
+                }
+            }
+
+            this._eltArray.push( elt );
+
+            // create the planes for this element
+            var plane = Object.create(this.ElementPlanes, {});
+            plane.setElement( elt );
+            plane.init();