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

diff --git a/js/models/materials-model.js b/js/models/materials-model.js
index 244db3c5..b8500234 100755
--- a/js/models/materials-model.js
+++ b/js/models/materials-model.js
@@ -69,37 +69,37 @@ exports.MaterialsModel = Montage.create(Component, {
         value: false
     },
 
-        deserializedFromTemplate: {
-                value: function() {
-                        // Load all the materials
-                        this.addMaterial(new FlatMaterial());
-                        this.addMaterial(new BumpMetalMaterial());
-                        //this.addMaterial(new CloudMaterial());
-                        this.addMaterial(new DeformMaterial());
-                        this.addMaterial(new FlagMaterial());
-                        this.addMaterial(new FlyMaterial());
-                        this.addMaterial(new JuliaMaterial());
-                        this.addMaterial(new KeleidoscopeMaterial());
-                        this.addMaterial(new LinearGradientMaterial());
-                        this.addMaterial(new MandelMaterial());
-                        this.addMaterial(new ParisMaterial());
-                        this.addMaterial(new PlasmaMaterial());
-                        this.addMaterial(new PulseMaterial());
-                        this.addMaterial(new RadialBlurMaterial());
-                        this.addMaterial(new RadialGradientMaterial());
-                        this.addMaterial(new RaidersMaterial());
-                        this.addMaterial(new ReliefTunnelMaterial());
-                        this.addMaterial(new SquareTunnelMaterial());
-                        this.addMaterial(new StarMaterial());
-                        this.addMaterial(new TaperMaterial());
-                        this.addMaterial(new TunnelMaterial());
-                        this.addMaterial(new TwistMaterial());
-                        this.addMaterial(new TwistVertMaterial());
-                        this.addMaterial(new UberMaterial());
-                        this.addMaterial(new WaterMaterial());
-                        this.addMaterial(new ZInvertMaterial());
-                }
-        },
+    deserializedFromTemplate: {
+        value: function() {
+            // Load all the materials
+            this.addMaterial(new FlatMaterial());
+            this.addMaterial(new BumpMetalMaterial());
+            //this.addMaterial(new CloudMaterial());
+            this.addMaterial(new DeformMaterial());
+            this.addMaterial(new FlagMaterial());
+            this.addMaterial(new FlyMaterial());
+            this.addMaterial(new JuliaMaterial());
+            this.addMaterial(new KeleidoscopeMaterial());
+            this.addMaterial(new LinearGradientMaterial());
+            this.addMaterial(new MandelMaterial());
+            this.addMaterial(new ParisMaterial());
+            this.addMaterial(new PlasmaMaterial());
+            this.addMaterial(new PulseMaterial());
+            this.addMaterial(new RadialBlurMaterial());
+            this.addMaterial(new RadialGradientMaterial());
+            this.addMaterial(new RaidersMaterial());
+            this.addMaterial(new ReliefTunnelMaterial());
+            this.addMaterial(new SquareTunnelMaterial());
+            this.addMaterial(new StarMaterial());
+            this.addMaterial(new TaperMaterial());
+            this.addMaterial(new TunnelMaterial());
+            this.addMaterial(new TwistMaterial());
+            this.addMaterial(new TwistVertMaterial());
+            this.addMaterial(new UberMaterial());
+            this.addMaterial(new WaterMaterial());
+            this.addMaterial(new ZInvertMaterial());
+        }
+    },
 
     _materials : {
         value: AppModel.materials
@@ -110,7 +110,7 @@ exports.MaterialsModel = Montage.create(Component, {
             return this._materials;
         }
     },
-    
+
     addMaterial: {
         value: function (material) {
             this._materials.push(material);
@@ -152,16 +152,16 @@ exports.MaterialsModel = Montage.create(Component, {
             }
         }
     },
-        
-        getMaterialByShader: 
-        {
-                value: function( shaderName )
-                {
-                        var index = this.getIndexOfMaterialByShader( shaderName );
-                        if (index >= 0)
-                                return this._materials[index];
-                }
-        },              
+
+    getMaterialByShader:
+    {
+        value: function( shaderName )
+        {
+            var index = this.getIndexOfMaterialByShader( shaderName );
+            if (index >= 0)
+                return this._materials[index];
+        }
+    },
 
     getIndexOfMaterialByShader: {
         value: function (shaderName) {
@@ -191,11 +191,11 @@ exports.MaterialsModel = Montage.create(Component, {
         }
     },
 
-        clearAllMaterials: {
-                value: function() {
-                        this._materials = [];
-                }
-        },
+    clearAllMaterials: {
+        value: function() {
+            this._materials = [];
+        }
+    },
 
     exportFlatMaterial: {
         value: function() {
@@ -203,108 +203,108 @@ exports.MaterialsModel = Montage.create(Component, {
         }
     },
 
-        getDefaultMaterialName: {
-                value: function() {
-                        return "Flat";
-                }
-        },
+    getDefaultMaterialName: {
+        value: function() {
+            return "Flat";
+        }
+    },
 
-        exportMaterials: {
-                value: function()
+    exportMaterials: {
+        value: function()
         {
             var matArray = [];
-                        var nMats = this._materials.length;
-                        for (var i=0;  i<nMats;  i++) {
-                                var material = this._materials[i];
-                                var matObj = material.exportJSON();
+            var nMats = this._materials.length;
+            for (var i=0;  i<nMats;  i++) {
+                var material = this._materials[i];
+                var matObj = material.exportJSON();
                 matArray.push( matObj );
-                        }
+            }
 
-                var jObj = 
-                {
+            var jObj =
+            {
                 'materialLibrary':  1.0,
                 'materials':        matArray
             };
 
-            // prepend an identifiable string to aid parsing when the 
+            // prepend an identifiable string to aid parsing when the
             // material model is loaded.
             var jStr = "materialLibrary;" + JSON.stringify( jObj );
 
-                        return jStr;
-                }
-        },
-
-        createMaterialByShaderName:
-        {
-                value: function(shaderName)
-                {
-                        var mat;
-                        switch (shaderName)
-                        {
-                                case "flat":                            mat = new FlatMaterial();                               break;
-                                case "linearGradient":          mat = new LinearGradientMaterial();             break;
-                                case "radialGradient":          mat = new RadialGradientMaterial();             break;
-                                case "bumpMetal":                       mat = new BumpMetalMaterial();                  break;
-                                case "uber":                            mat = new UberMaterial();                               break;
-                                //case "cloud":                         mat = new CloudMaterial();                              break;
-
-                                case "taper":                           mat = new TaperMaterial();                              break;
-                                case "twistVert":                       mat = new TwistVertMaterial();                  break;
-                                case "radialBlur":                      mat = new RadialBlurMaterial();                 break;
-                                case "plasma":                          mat = new PlasmaMaterial();                             break;
-                                case "pulse":                           mat = new PulseMaterial();                              break;
-                                case "tunnel":                          mat = new TunnelMaterial();                             break;
-                                case "reliefTunnel":            mat = new ReliefTunnelMaterial();               break;
-                                case "squareTunnel":            mat = new SquareTunnelMaterial();               break;
-                                case "flag":                    mat = new FlagMaterial();                       break;
-                                case "fly":                                     mat = new FlyMaterial();                                break;
-                                case "water":                           mat = new WaterMaterial();                              break;
-                                case "paris":                           mat = new ParisMaterial();                              break;
-                                case "raiders":                 mat = new RaidersMaterial();                break;
+            return jStr;
+        }
+    },
+
+    createMaterialByShaderName:
+    {
+        value: function(shaderName)
+        {
+            var mat;
+            switch (shaderName)
+            {
+                case "flat":                mat = new FlatMaterial();               break;
+                case "linearGradient":      mat = new LinearGradientMaterial();     break;
+                case "radialGradient":      mat = new RadialGradientMaterial();     break;
+                case "bumpMetal":           mat = new BumpMetalMaterial();          break;
+                case "uber":                mat = new UberMaterial();               break;
+                //case "cloud":             mat = new CloudMaterial();              break;
+
+                case "taper":               mat = new TaperMaterial();              break;
+                case "twistVert":           mat = new TwistVertMaterial();          break;
+                case "radialBlur":          mat = new RadialBlurMaterial();         break;
+                case "plasma":              mat = new PlasmaMaterial();             break;
+                case "pulse":               mat = new PulseMaterial();              break;
+                case "tunnel":              mat = new TunnelMaterial();             break;
+                case "reliefTunnel":        mat = new ReliefTunnelMaterial();       break;
+                case "squareTunnel":        mat = new SquareTunnelMaterial();       break;
+                case "flag":                mat = new FlagMaterial();               break;
+                case "fly":                 mat = new FlyMaterial();                break;
+                case "water":               mat = new WaterMaterial();              break;
+                case "paris":               mat = new ParisMaterial();              break;
+                case "raiders":             mat = new RaidersMaterial();            break;