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>

18 files changed, 2676 insertions, 2676 deletions

diff --git a/assets/canvas-runtime.js b/assets/canvas-runtime.js
index ce392f34..42d90333 100644
--- a/assets/canvas-runtime.js
+++ b/assets/canvas-runtime.js
@@ -36,42 +36,42 @@ var NinjaCvsRt =  NinjaCvsRt || {};
 window.addEventListener('load', loadCanvasData, false);
 //Load data function (on document loaded)
 function loadCanvasData (e) {
-        //Cleaning up events
-        window.removeEventListener('load', loadCanvasData, false);
+    //Cleaning up events
+    window.removeEventListener('load', loadCanvasData, false);
     //Getting tag with data, MUST contain attribute
     var xhr, tag = document.querySelectorAll(['script[data-ninja-canvas-lib]'])[0];
-        //Checking for data to be external file
-        if (tag.getAttribute('data-ninja-canvas-json') !== null) {
-                //Loading JSON data
-                xhr = new XMLHttpRequest();
+    //Checking for data to be external file
+    if (tag.getAttribute('data-ninja-canvas-json') !== null) {
+        //Loading JSON data
+        xhr = new XMLHttpRequest();
         xhr.open("GET", tag.getAttribute('data-ninja-canvas-json'), false);
         xhr.send();
-                //Checking for data
-        if (xhr.readyState === 4) {
-                //Calling method to initialize all webGL/canvas(es)
-                        NinjaCvsRt.initWebGl(document.body, tag.getAttribute('data-ninja-canvas-libpath'), xhr.response);
-        } else {
-                //TODO: Add error for users
-        }
-        } else {//Data in document itself
-                //Calling method to initialize all webGL/canvas(es)
-                NinjaCvsRt.initWebGl(document.body, tag.getAttribute('data-ninja-canvas-libpath'), document.querySelectorAll(['script[data-ninja-canvas]'])[0].innerHTML);
-        }
+        //Checking for data
+        if (xhr.readyState === 4) {
+            //Calling method to initialize all webGL/canvas(es)
+            NinjaCvsRt.initWebGl(document.body, tag.getAttribute('data-ninja-canvas-libpath'), xhr.response);
+        } else {
+            //TODO: Add error for users
+        }
+    } else {//Data in document itself
+        //Calling method to initialize all webGL/canvas(es)
+        NinjaCvsRt.initWebGl(document.body, tag.getAttribute('data-ninja-canvas-libpath'), document.querySelectorAll(['script[data-ninja-canvas]'])[0].innerHTML);
+    }
 }
 
 ///////////////////////////////////////////////////////////////////////
 //Loading webGL/canvas data
 NinjaCvsRt.initWebGl = function (rootElement, directory, data) {
-        var cvsDataMngr, ninjaWebGlData = JSON.parse((data.replace('(', '')).replace(')', ''));
-        if (ninjaWebGlData && ninjaWebGlData.data) {
-                for (var n=0; ninjaWebGlData.data[n]; n++) {
-                        ninjaWebGlData.data[n] = unescape(ninjaWebGlData.data[n]);
-                }
-        }
-        //Creating data manager
-        cvsDataMngr = Object.create(NinjaCvsRt.CanvasDataManager, {});
-        //Loading data to canvas(es)
-        cvsDataMngr.loadGLData(rootElement, ninjaWebGlData.data, directory);
+    var cvsDataMngr, ninjaWebGlData = JSON.parse((data.replace('(', '')).replace(')', ''));
+    if (ninjaWebGlData && ninjaWebGlData.data) {
+        for (var n=0; ninjaWebGlData.data[n]; n++) {
+            ninjaWebGlData.data[n] = unescape(ninjaWebGlData.data[n]);
+        }
+    }
+    //Creating data manager
+    cvsDataMngr = Object.create(NinjaCvsRt.CanvasDataManager, {});
+    //Loading data to canvas(es)
+    cvsDataMngr.loadGLData(rootElement, ninjaWebGlData.data, directory);
 };
 
 ///////////////////////////////////////////////////////////////////////
@@ -80,64 +80,64 @@ NinjaCvsRt.initWebGl = function (rootElement, directory, data) {
 ///////////////////////////////////////////////////////////////////////
 NinjaCvsRt.CanvasDataManager = Object.create(Object.prototype, {
 
-        loadGLData: {
-                value: function(root, valueArray, assetPath) {
-                        if (assetPath)
-                                this._assetPath = assetPath.slice();
-
-                        var value = valueArray;
-                        var nWorlds = value.length;
-                        for (var i=0;  i<nWorlds;  i++)
-                        {
-                                var importStr = value[i];
-
-                                // there should be some version information in
-                                // the form of 'v0.0;'  Pull that off.  (the trailing ';' should
-                                // be in the first 24 characters).
-                                var index = importStr.indexOf( ';' );
-                                if ((importStr[0] === 'v') && (index < 24))
-                                {
-                                        // JSON format.  pull off the version info
-                                        importStr = importStr.substr( index+1 );
-
-                                        var jObj = JSON.parse( importStr );
-                                        var id = jObj.id;
-                                        if (id)
-                                        {
-                                                var canvas = this.findCanvasWithID( id, root );
-                                                if (canvas)
-                                                {
+    loadGLData: {
+        value: function(root, valueArray, assetPath) {
+            if (assetPath)
+                this._assetPath = assetPath.slice();
+
+            var value = valueArray;
+            var nWorlds = value.length;
+            for (var i=0;  i<nWorlds;  i++)
+            {
+                var importStr = value[i];
+
+                // there should be some version information in
+                // the form of 'v0.0;'  Pull that off.  (the trailing ';' should
+                // be in the first 24 characters).
+                var index = importStr.indexOf( ';' );
+                if ((importStr[0] === 'v') && (index < 24))
+                {
+                    // JSON format.  pull off the version info
+                    importStr = importStr.substr( index+1 );
+
+                    var jObj = JSON.parse( importStr );
+                    var id = jObj.id;
+                    if (id)
+                    {
+                        var canvas = this.findCanvasWithID( id, root );
+                        if (canvas)
+                        {
 //                            new NinjaCvsRt.GLRuntime( canvas, jObj,  assetPath );
-                                                        var glRt = Object.create(NinjaCvsRt.GLRuntime, {});
-                                                        glRt.renderWorld(canvas, jObj, this._assetPath);
-                                                }
-                                                else
-                                                {
-                                                        console.log( "***** COULD NOT FIND CANVAS WITH ID " + id + " *****" );
-                                                }
-                                        }
-                                }
-                        }
-                }
-        },
-
-        findCanvasWithID: {
-                value: function(id, elt) {
-                        var cid = elt.getAttribute( "data-RDGE-id" );
-                        if (cid == id)  return elt;
-
-                        if (elt.children)
-                        {
-                                var nKids = elt.children.length;
-                                for (var i=0;  i<nKids;  i++)
-                                {
-                                        var child = elt.children[i];
-                                        var foundElt = this.findCanvasWithID( id, child );
-                                        if (foundElt)  return foundElt;
-                                }
-                        }
-                }
-        }
+                            var glRt = Object.create(NinjaCvsRt.GLRuntime, {});
+                            glRt.renderWorld(canvas, jObj, this._assetPath);
+                        }
+                        else
+                        {
+                            console.log( "***** COULD NOT FIND CANVAS WITH ID " + id + " *****" );
+                        }
+                    }
+                }
+            }
+        }
+    },
+
+    findCanvasWithID: {
+        value: function(id, elt) {
+            var cid = elt.getAttribute( "data-RDGE-id" );
+            if (cid == id)  return elt;
+
+            if (elt.children)
+            {
+                var nKids = elt.children.length;
+                for (var i=0;  i<nKids;  i++)
+                {
+                    var child = elt.children[i];
+                    var foundElt = this.findCanvasWithID( id, child );
+                    if (foundElt)  return foundElt;
+                }
+            }
+        }
+    }
 });
 
 ///////////////////////////////////////////////////////////////////////
@@ -145,267 +145,267 @@ NinjaCvsRt.CanvasDataManager = Object.create(Object.prototype, {
 //      Manages runtime fora WebGL canvas
 ///////////////////////////////////////////////////////////////////////
 NinjaCvsRt.GLRuntime = Object.create(Object.prototype, {
-        ///////////////////////////////////////////////////////////////////////
-        // Instance variables
-        ///////////////////////////////////////////////////////////////////////
-        _canvas: { value: null, writable: true },
-        _context : { value: null, writable: true },
-        //this._importStr               = importStr;
-        _jObj: { value: null, writable: true },
-
-        _renderer: { value: null, writable: true },
-        myScene: { value: null, writable: true },
+    ///////////////////////////////////////////////////////////////////////
+    // Instance variables
+    ///////////////////////////////////////////////////////////////////////
+    _canvas: { value: null, writable: true },
+    _context : { value: null, writable: true },
+    //this._importStr       = importStr;
+    _jObj: { value: null, writable: true },
+
+    _renderer: { value: null, writable: true },
+    myScene: { value: null, writable: true },