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

diff --git a/js/io/system/projectio.js b/js/io/system/projectio.js
index 785c7d7c..f9daa2df 100755
--- a/js/io/system/projectio.js
+++ b/js/io/system/projectio.js
@@ -30,75 +30,75 @@ POSSIBILITY OF SUCH DAMAGE.
 
 ////////////////////////////////////////////////////////////////////////
 //
-var Montage =   require("montage/core/core").Montage,
-        FileIo =        require("js/io/system/fileio").FileIo;
+var Montage =   require("montage/core/core").Montage,
+    FileIo =    require("js/io/system/fileio").FileIo;
 ////////////////////////////////////////////////////////////////////////
 //
 exports.ProjectIo = Montage.create(Object.prototype, {
-        ////////////////////////////////////////////////////////////////////
+    ////////////////////////////////////////////////////////////////////
     //
     newProject: {
-        enumerable: false,
-        value: function () {
-                //Checking for API to be available
-                if (!this.application.ninja.coreIoApi.cloudAvailable()) {
-                        //API not available, no IO action taken
-                        return null;
-                }
-                //
-        }
+        enumerable: false,
+        value: function () {
+            //Checking for API to be available
+            if (!this.application.ninja.coreIoApi.cloudAvailable()) {
+                //API not available, no IO action taken
+                return null;
+            }
+            //
+        }
     },
-        ////////////////////////////////////////////////////////////////////
+    ////////////////////////////////////////////////////////////////////
     //
     readProject: {
-        enumerable: false,
-        value: function(e) {
-                //Checking for API to be available
-                if (!this.application.ninja.coreIoApi.cloudAvailable()) {
-                        //API not available, no IO action taken
-                        return null;
-                }
-                //
-        }
+        enumerable: false,
+        value: function(e) {
+            //Checking for API to be available
+            if (!this.application.ninja.coreIoApi.cloudAvailable()) {
+                //API not available, no IO action taken
+                return null;
+            }
+            //
+        }
     },
     ////////////////////////////////////////////////////////////////////
     //
     saveProject: {
-        enumerable: false,
-        value: function() {
-                //Checking for API to be available
-                if (!this.application.ninja.coreIoApi.cloudAvailable()) {
-                        //API not available, no IO action taken
-                        return null;
-                }
-                //
-        }
+        enumerable: false,
+        value: function() {
+            //Checking for API to be available
+            if (!this.application.ninja.coreIoApi.cloudAvailable()) {
+                //API not available, no IO action taken
+                return null;
+            }
+            //
+        }
     },
     ////////////////////////////////////////////////////////////////////
     //
     copyProject: {
-        enumerable: false,
-        value: function(e) {
-                //Checking for API to be available
-                if (!this.application.ninja.coreIoApi.cloudAvailable()) {
-                        //API not available, no IO action taken
-                        return null;
-                }
-                //
-        }
+        enumerable: false,
+        value: function(e) {
+            //Checking for API to be available
+            if (!this.application.ninja.coreIoApi.cloudAvailable()) {
+                //API not available, no IO action taken
+                return null;
+            }
+            //
+        }
     },
     ////////////////////////////////////////////////////////////////////
     //
     infoProject: {
-        enumerable: false,
-        value: function(e) {
-                //Checking for API to be available
-                if (!this.application.ninja.coreIoApi.cloudAvailable()) {
-                        //API not available, no IO action taken
-                        return null;
-                }
-                //
-        }
+        enumerable: false,
+        value: function(e) {
+            //Checking for API to be available
+            if (!this.application.ninja.coreIoApi.cloudAvailable()) {
+                //API not available, no IO action taken
+                return null;
+            }
+            //
+        }
     }
     ////////////////////////////////////////////////////////////////////
     ////////////////////////////////////////////////////////////////////