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

diff --git a/js/lib/geom/circle.js b/js/lib/geom/circle.js
index 2cd5a21f..53847631 100755
--- a/js/lib/geom/circle.js
+++ b/js/lib/geom/circle.js
@@ -31,60 +31,60 @@ POSSIBILITY OF SUCH DAMAGE.
 var GeomObj =           require("js/lib/geom/geom-obj").GeomObj;
 var ShapePrimitive =    require("js/lib/geom/shape-primitive").ShapePrimitive;
 var MaterialsModel = require("js/models/materials-model").MaterialsModel;
-var drawUtils           = require("js/helper-classes/3D/draw-utils").DrawUtils;
-var vecUtils            = require("js/helper-classes/3D/vec-utils").VecUtils;
+var drawUtils       = require("js/helper-classes/3D/draw-utils").DrawUtils;
+var vecUtils        = require("js/helper-classes/3D/vec-utils").VecUtils;
 
 ///////////////////////////////////////////////////////////////////////
 // Class GLCircle
 //      GL representation of a circle.
 //      Derived from class GLGeomObj
-//              The position and dimensions of the stroke, fill, and inner Radius should be in pixels
+//      The position and dimensions of the stroke, fill, and inner Radius should be in pixels
 ///////////////////////////////////////////////////////////////////////
 exports.Circle = Object.create(GeomObj, {
 
-        ///////////////////////////////////////////////////////////////////////
-        // Instance variables
-        ///////////////////////////////////////////////////////////////////////
-        _width: { value : 2.0, writable: true },
-        _height: { value : 2.0, writable: true },
-        _xOffset: { value : 0, writable: true },
-        _yOffset: { value : 0, writable: true },
-
-        _radius: { value : 2.0, writable: true },
-        _strokeWidth: { value : 0.25, writable: true },
-        _innerRadius: { value : 0, writable: true },
-        _ovalHeight: { value : 4.0, writable: true },
-        _strokeStyle: { value : "Solid", writable: true },
-        _aspectRatio: { value : 1.0, writable: true },
-
-        init: {
-                value: function(world, xOffset, yOffset, width, height, strokeSize, strokeColor, fillColor, innerRadius, strokeMaterial, fillMaterial, strokeStyle) {
-                        if(arguments.length > 0) {
-                                this._width = width;
-                                this._height = height;
-                                this._xOffset = xOffset;
-                                this._yOffset = yOffset;
-                                this._ovalHeight = 2.0 * this._radius;
-
-                                this._strokeWidth = strokeSize;
-                                this._innerRadius = innerRadius;
-                                this._strokeColor = strokeColor;
-                                this._fillColor = fillColor;
-
-                                this._strokeStyle = strokeStyle;
-
-                                this._matrix = Matrix.I(4);
-                                //this._matrix[12] = xOffset;
-                                //this._matrix[13] = yOffset;
-                        }
+    ///////////////////////////////////////////////////////////////////////
+    // Instance variables
+    ///////////////////////////////////////////////////////////////////////
+    _width: { value : 2.0, writable: true },
+    _height: { value : 2.0, writable: true },
+    _xOffset: { value : 0, writable: true },
+    _yOffset: { value : 0, writable: true },
+
+    _radius: { value : 2.0, writable: true },
+    _strokeWidth: { value : 0.25, writable: true },
+    _innerRadius: { value : 0, writable: true },
+    _ovalHeight: { value : 4.0, writable: true },
+    _strokeStyle: { value : "Solid", writable: true },
+    _aspectRatio: { value : 1.0, writable: true },
+
+    init: {
+        value: function(world, xOffset, yOffset, width, height, strokeSize, strokeColor, fillColor, innerRadius, strokeMaterial, fillMaterial, strokeStyle) {
+            if(arguments.length > 0) {
+                this._width = width;
+                this._height = height;
+                this._xOffset = xOffset;
+                this._yOffset = yOffset;
+                this._ovalHeight = 2.0 * this._radius;
+
+                this._strokeWidth = strokeSize;
+                this._innerRadius = innerRadius;
+                this._strokeColor = strokeColor;
+                this._fillColor = fillColor;
+
+                this._strokeStyle = strokeStyle;
+
+                this._matrix = Matrix.I(4);
+                //this._matrix[12] = xOffset;
+                //this._matrix[13] = yOffset;
+            }
 
-                        this.m_world = world;
+            this.m_world = world;
 
-                        if(strokeMaterial) {
-                                this._strokeMaterial = strokeMaterial.dup();
-                        } else {
-                                this._strokeMaterial = MaterialsModel.getMaterial( MaterialsModel.getDefaultMaterialName() ).dup();
-                        }
+            if(strokeMaterial) {
+                this._strokeMaterial = strokeMaterial.dup();
+            } else {
+                this._strokeMaterial = MaterialsModel.getMaterial( MaterialsModel.getDefaultMaterialName() ).dup();
+            }
 
             if(strokeColor) {
                 if(this._strokeMaterial.hasProperty("color")) {
@@ -94,135 +94,135 @@ exports.Circle = Object.create(GeomObj, {
                 }
             }
 
-                        if(fillMaterial) {
-                                this._fillMaterial = fillMaterial.dup();
-                        } else {
-                                this._fillMaterial = MaterialsModel.getMaterial(  MaterialsModel.getDefaultMaterialName() ).dup();
-                        }
+            if(fillMaterial) {
+                this._fillMaterial = fillMaterial.dup();
+            } else {
+                this._fillMaterial = MaterialsModel.getMaterial(  MaterialsModel.getDefaultMaterialName() ).dup();
+            }
 
             if(fillColor) {
                 if(this._fillMaterial.hasProperty("color")) {
                     this._fillMaterial.setProperty( "color",  this._fillColor );
                 } else if (this._fillMaterial && (this._fillMaterial.gradientType === this._fillColor.gradientMode)) {
                     this._fillMaterial.setGradientData(this._fillColor.color);
-                }
+        }
             }
         }
-        },
-
-        ///////////////////////////////////////////////////////////////////////
-        // Property Accessors
-        ///////////////////////////////////////////////////////////////////////
-        // TODO - Use getters/setters in the future
-        getStrokeWidth: {
-                value: function() {
-                        return this._strokeWidth;
-                }
-        },
-
-        setStrokeWidth: {
-                value: function(w) {
-                        this._strokeWidth = w;
-                }
-        },
-
-        getStrokeMaterial: {
-                value: function() {
-                        return this._strokeMaterial;
-                }
-        },
-
-        setStrokeMaterial: {
-                value: function(m) {
-                        this._strokeMaterial = m;
-                }
-        },
-
-        getFillMaterial: {
-                value: function() {
-                        return this._fillMaterial;
-                }
-        },
-
-        setFillMaterial: {
-                value: function(m) {
-                        this._fillMaterial = m;
-                }
-        },
-
-        getRadius: {
-                value: function() {
-                        return this._radius;
-                }
-        },
-
-        setRadius: {
-                value: function(r) {
-                        this._radius = r;
-                }
-        },
-
-        getInnerRadius: {
-                value: function() {
-                        return this._innerRadius;
-                }
-        },
-
-        setInnerRadius: {
-                value: function(r) {
-                        this._innerRadius = r;
-                }
-        },
-
-        getStrokeStyle: {
+    },
+
+    ///////////////////////////////////////////////////////////////////////
+    // Property Accessors
+    ///////////////////////////////////////////////////////////////////////
+    // TODO - Use getters/setters in the future
+    getStrokeWidth: {
+        value: function() {
+            return this._strokeWidth;
+        }
+    },
+
+    setStrokeWidth: {
+        value: function(w) {
+            this._strokeWidth = w;
+        }
+    },
+
+    getStrokeMaterial: {
+        value: function() {
+            return this._strokeMaterial;
+        }
+    },
+
+    setStrokeMaterial: {
+        value: function(m) {
+            this._strokeMaterial = m;
+        }
+    },
+
+    getFillMaterial: {
+        value: function() {
+            return this._fillMaterial;
+        }
+    },
+
+    setFillMaterial: {
+        value: function(m) {
+            this._fillMaterial = m;
+        }
+    },
+
+    getRadius: {
+        value: function() {
+            return this._radius;
+        }
+    },
+
+    setRadius: {
+        value: function(r) {
+            this._radius = r;
+        }
+    },
+
+    getInnerRadius: {
+        value: function() {
+            return this._innerRadius;
+        }
+    },
+
+    setInnerRadius: {
+        value: function(r) {
+            this._innerRadius = r;
+        }
+    },
+
+    getStrokeStyle: {