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

diff --git a/js/io/system/coreioapi.js b/js/io/system/coreioapi.js
index d3977106..c3782aef 100755
--- a/js/io/system/coreioapi.js
+++ b/js/io/system/coreioapi.js
@@ -32,87 +32,87 @@ POSSIBILITY OF SUCH DAMAGE.
 ////////////////////////////////////////////////////////////////////////
 NOTES:
 
-        Core API reference in NINJA: this.application.ninja.coreIoApi
-        
+    Core API reference in NINJA: this.application.ninja.coreIoApi
+
 ////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////// */
-var Montage =           require("montage/core/core").Montage,
-    Component =         require("montage/ui/component").Component,
-    Popup =             require("js/components/popup.reel").Popup,
-    CloudPopup =        require("js/io/ui/cloudpopup.reel").CloudPopup,
-    ChromeApi =         require("js/io/system/chromeapi").ChromeApi,
-    NinjaLibrary =      require("js/io/system/ninjalibrary").NinjaLibrary;
+var Montage =       require("montage/core/core").Montage,
+    Component =     require("montage/ui/component").Component,
+    Popup =         require("js/components/popup.reel").Popup,
+    CloudPopup =    require("js/io/ui/cloudpopup.reel").CloudPopup,
+    ChromeApi =     require("js/io/system/chromeapi").ChromeApi,
+    NinjaLibrary =  require("js/io/system/ninjalibrary").NinjaLibrary;
 ////////////////////////////////////////////////////////////////////////
 //Exporting as Project I/O
 exports.CoreIoApi = Montage.create(Component, {
     ////////////////////////////////////////////////////////////////////
     //
-        deserializedFromTemplate: {
-                enumerable: false,
-                value: function () {
-                        ////////////////////////////////////////////////////////////
-                        //Checking for local storage of URL for IO
+    deserializedFromTemplate: {
+        enumerable: false,
+        value: function () {
+            ////////////////////////////////////////////////////////////
+            //Checking for local storage of URL for IO
             if (this.application.localStorage.getItem("ioRootUrl")) {
-                                //Getting URL from local storage
+                //Getting URL from local storage
                 this.rootUrl = this.application.localStorage.getItem("ioRootUrl");
-                                //Checks for IO API to be active
-                                this.ioServiceDetected = this.cloudAvailable();
-                        } else {
-                                //IO API to be inactive
-                                this.ioServiceDetected = false;
-                        }
-                        ////////////////////////////////////////////////////////////
-                        //Instance of ninja library
-                        this.ninjaLibrary = NinjaLibrary;
-                        this.ninjaLibrary.coreApi = this;
-                        //Getting reference of chrome file system API
-                        this.chromeFileSystem = ChromeApi;
-                        //Sending size in MBs for file system storage
-                        var chromeFs = this.chromeFileSystem.init(20);
-                        //Checking for availability of API
-                        if (chromeFs) {
-                                this.chromeFileSystem.addEventListener('ready', this, false);
-                        } else {
-                                //Error, Chrome File System API not detected
-                        }
-                        ////////////////////////////////////////////////////////////
-                }
-        },
-        ////////////////////////////////////////////////////////////////////
+                //Checks for IO API to be active
+                this.ioServiceDetected = this.cloudAvailable();
+            } else {
+                //IO API to be inactive
+                this.ioServiceDetected = false;
+            }
+            ////////////////////////////////////////////////////////////
+            //Instance of ninja library
+            this.ninjaLibrary = NinjaLibrary;
+            this.ninjaLibrary.coreApi = this;
+            //Getting reference of chrome file system API
+            this.chromeFileSystem = ChromeApi;
+            //Sending size in MBs for file system storage
+            var chromeFs = this.chromeFileSystem.init(20);
+            //Checking for availability of API
+            if (chromeFs) {
+                this.chromeFileSystem.addEventListener('ready', this, false);
+            } else {
+                //Error, Chrome File System API not detected
+            }
+            ////////////////////////////////////////////////////////////
+        }
+    },
+    ////////////////////////////////////////////////////////////////////
     //
-        handleReady: {
-                enumerable: false,
+    handleReady: {
+        enumerable: false,
         value: function (e) {
-                //Removing events
-                this.chromeFileSystem.removeEventListener('ready', this, false);
-                //Listening for library to be copied event (builds list)
-                this.chromeFileSystem.addEventListener('library', this, false);
-                //TODO: Add sync loading screen logic (Add screen here)
+            //Removing events
+            this.chromeFileSystem.removeEventListener('ready', this, false);
+            //Listening for library to be copied event (builds list)
+            this.chromeFileSystem.addEventListener('library', this, false);
+            //TODO: Add sync loading screen logic (Add screen here)
         }
-        },
-        ////////////////////////////////////////////////////////////////////
+    },
+    ////////////////////////////////////////////////////////////////////
     //
-        handleLibrary: {
-                enumerable: false,
+    handleLibrary: {
+        enumerable: false,
         value: function (e) {
-                //Removing events
-                this.chromeFileSystem.removeEventListener('library', this, false);
-                //Listening for synced library event
-                this.ninjaLibrary.addEventListener('sync', this, false);
-                //Sending library to be synced to chrome
-                this.ninjaLibrary.synchronize(e._event.ninjaChromeLibrary, this.chromeFileSystem);
-                
+            //Removing events
+            this.chromeFileSystem.removeEventListener('library', this, false);
+            //Listening for synced library event
+            this.ninjaLibrary.addEventListener('sync', this, false);
+            //Sending library to be synced to chrome
+            this.ninjaLibrary.synchronize(e._event.ninjaChromeLibrary, this.chromeFileSystem);
+
         }
-        },
-        ////////////////////////////////////////////////////////////////////
+    },
+    ////////////////////////////////////////////////////////////////////
     //
-        handleSync: {
-                enumerable: false,
+    handleSync: {
+        enumerable: false,
         value: function (e) {
-                console.log('Ninja Local Library: Ready');
-                //Removing events
-                this.ninjaLibrary.removeEventListener('sync', this, false);
-                //TODO: Add sync loading screen logic (Remove screen here)
+            console.log('Ninja Local Library: Ready');
+            //Removing events
+            this.ninjaLibrary.removeEventListener('sync', this, false);
+            //TODO: Add sync loading screen logic (Remove screen here)
         }
     },
     ////////////////////////////////////////////////////////////////////
@@ -124,12 +124,12 @@ exports.CoreIoApi = Montage.create(Component, {
     ////////////////////////////////////////////////////////////////////
     //
     chromeNinjaLibrary: {
-        enumerable: false,
-        get: function() {
+        enumerable: false,
+        get: function() {
             return this._chromeNinjaLibrary;
         },
         set: function(value) {
-                this._chromeNinjaLibrary = value;
+            this._chromeNinjaLibrary = value;
         }
     },
     ////////////////////////////////////////////////////////////////////
@@ -141,15 +141,15 @@ exports.CoreIoApi = Montage.create(Component, {
     ////////////////////////////////////////////////////////////////////
     //
     chromeFileSystem: {
-        enumerable: false,
-        get: function() {
+        enumerable: false,
+        get: function() {
             return this._chromeFileSystem;
         },
         set: function(value) {
-                this._chromeFileSystem = value;
+            this._chromeFileSystem = value;
         }
     },
-        ////////////////////////////////////////////////////////////////////
+    ////////////////////////////////////////////////////////////////////
     //
     _ioServiceDetected: {
         enumerable: false,
@@ -158,15 +158,15 @@ exports.CoreIoApi = Montage.create(Component, {
     ////////////////////////////////////////////////////////////////////
     //Checking for service availability on boot
     ioServiceDetected: {
-        enumerable: false,
-        get: function() {
+        enumerable: false,
+        get: function() {
             return this._ioServiceDetected;
         },
         set: function(value) {
-                this._ioServiceDetected = value;
+            this._ioServiceDetected = value;
         }
     },
-        ////////////////////////////////////////////////////////////////////
+    ////////////////////////////////////////////////////////////////////
     //Root API URL
     _rootUrl: {
         enumerable: false,
@@ -175,15 +175,15 @@ exports.CoreIoApi = Montage.create(Component, {
     ////////////////////////////////////////////////////////////////////
     //
     rootUrl: {
-        enumerable: false,
-        get: function() {
+        enumerable: false,
+        get: function() {
             return this._rootUrl;
         },
         set: function(value) {
-                this._rootUrl = this.application.localStorage.setItem("ioRootUrl", value);
+            this._rootUrl = this.applicat