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

diff --git a/js/io/system/ninjalibrary.js b/js/io/system/ninjalibrary.js
index 1467d18f..be59fd07 100644
--- a/js/io/system/ninjalibrary.js
+++ b/js/io/system/ninjalibrary.js
@@ -34,7 +34,7 @@ var Montage = require("montage/core/core").Montage;
 ////////////////////////////////////////////////////////////////////////
 //
 exports.NinjaLibrary = Montage.create(Object.prototype, {
-        ////////////////////////////////////////////////////////////////////
+    ////////////////////////////////////////////////////////////////////
     //
     _chromeApi: {
         value: null
@@ -42,7 +42,7 @@ exports.NinjaLibrary = Montage.create(Object.prototype, {
     ////////////////////////////////////////////////////////////////////
     //
     chromeApi: {
-        get: function() {return this._chromeApi;},
+        get: function() {return this._chromeApi;},
         set: function(value) {this._chromeApi = value;}
     },
     ////////////////////////////////////////////////////////////////////
@@ -53,7 +53,7 @@ exports.NinjaLibrary = Montage.create(Object.prototype, {
     ////////////////////////////////////////////////////////////////////
     //
     coreApi: {
-        get: function() {return this._coreApi;},
+        get: function() {return this._coreApi;},
         set: function(value) {this._coreApi = value;}
     },
     ////////////////////////////////////////////////////////////////////
@@ -64,7 +64,7 @@ exports.NinjaLibrary = Montage.create(Object.prototype, {
     ////////////////////////////////////////////////////////////////////
     //
     libs: {
-        get: function() {return this._libs;},
+        get: function() {return this._libs;},
         set: function(value) {this._libs = value;}
     },
     ////////////////////////////////////////////////////////////////////
@@ -81,114 +81,114 @@ exports.NinjaLibrary = Montage.create(Object.prototype, {
     //
     copyLibToCloud: {
         value: function (path, libName, callback) {
-                var libCheck = this.coreApi.directoryExists({uri: path+libName});
-                //Checking for library to exists
-                if(libCheck.status === 404) {
-                        //Getting contents to begin copying
-                        this.chromeApi.directoryContents(this.chromeApi.fileSystem.root, function (contents) {
-                                for (var i in contents) {
-                                if (libName === contents[i].name) {
-                                                //Getting contents of library to be copied
-                                                this.chromeApi.directoryContents(contents[i], function (lib) {
-                                                        //Copying to cloud
-                                                        if (callback) {
-                                                                this.copyDirectoryToCloud(path, contents[i], path, {total: 0, copied: 0, callback: callback.bind(this)});
-                                                        } else {
-                                                                this.copyDirectoryToCloud(path, contents[i], path, {total: 0, copied: 0});
-                                                        }
-                                                }.bind(this));
-                                                break;
-                                        }
-                        }
-                        }.bind(this));
-                } else if (libCheck.status === 204){
-                        //Already present, so sending success
-                        if (callback) callback(true);
-                } else {
-                        if (callback) callback(false);
-                }
+            var libCheck = this.coreApi.directoryExists({uri: path+libName});
+            //Checking for library to exists
+            if(libCheck.status === 404) {
+                //Getting contents to begin copying
+                this.chromeApi.directoryContents(this.chromeApi.fileSystem.root, function (contents) {
+                    for (var i in contents) {
+                        if (libName === contents[i].name) {
+                            //Getting contents of library to be copied
+                            this.chromeApi.directoryContents(contents[i], function (lib) {
+                                //Copying to cloud
+                                if (callback) {
+                                    this.copyDirectoryToCloud(path, contents[i], path, {total: 0, copied: 0, callback: callback.bind(this)});
+                                } else {
+                                    this.copyDirectoryToCloud(path, contents[i], path, {total: 0, copied: 0});
+                                }
+                            }.bind(this));
+                            break;
+                        }
+                    }
+                }.bind(this));
+            } else if (libCheck.status === 204){
+                //Already present, so sending success
+                if (callback) callback(true);
+            } else {
+                if (callback) callback(false);
+            }
         }
     },
     ////////////////////////////////////////////////////////////////////
     //
     copyDirectoryToCloud: {
-        value: function(root, folder, fileRoot, tracking) {
-                //Setting up directory name
-                if (folder.name) {
-                        var dir;
-                            if (root) {
-                                        dir = root+'/'+folder.name;
-                            } else {
-                                dir = folder.name;
-                            }
-                            //Creating directory
-                            if (!this.coreApi.createDirectory({uri: dir.replace(/\/\//gi, '/')})) {
-                                //Error occured while creating folders
-                                return; //TODO: Add error handling
-                            }
-                        }
-                        //Checking for directory
-                        if (folder.isDirectory) {
-                                //Using Chrome API to get directory contents
-                                this.chromeApi.directoryContents(folder, function (contents) {
-                                        //Looping through children of directory to copy
-                                        for (var i in contents) {
-                                                //Checking for file or directory
-                                                if (contents[i].isDirectory) {
-                                                        //Recursive call if directory
-                                                        this.copyDirectoryToCloud(dir, contents[i], fileRoot, tracking);
-                                                } else if (contents[i].isFile){
-                                                        //
-                                                        tracking.total++;
-                                                        //Copying file 
-                                                        this.chromeApi.fileContent(contents[i].fullPath, function (result) {
-                                                                //Using binary when copying files to allow images and such to work
-                                                                var file = this.coreApi.createFile({uri: (fileRoot+result.file.fullPath).replace(/\/\//gi, '/'), contents: result.content});
-                                                                //Checking for file copy success
-                                                                if (file.status === 201) {
-                                                                        tracking.copied++;
-                                                                } else {
-                                                                        //Error
-                                                                        tracking.callback(false);
-                                                                }
-                                                                //Checking for all files to be copied to make callback
-                                                                if (tracking.copied === tracking.total && tracking.callback) {
-                                                                        tracking.callback(true);
-                                                                }
-                                                        }.bind(this));
-                                                }
-                                        }
-                                }.bind(this));
-                        }
-        }
+        value: function(root, folder, fileRoot, tracking) {
+            //Setting up directory name
+            if (folder.name) {
+                var dir;
+                if (root) {
+                    dir = root+'/'+folder.name;
+                } else {
+                    dir = folder.name;
+                }
+                //Creating directory
+                if (!this.coreApi.createDirectory({uri: dir.replace(/\/\//gi, '/')})) {
+                    //Error occured while creating folders
+                    return; //TODO: Add error handling
+                }
+            }
+            //Checking for directory
+            if (folder.isDirectory) {
+                //Using Chrome API to get directory contents
+                this.chromeApi.directoryContents(folder, function (contents) {
+                    //Looping through children of directory to copy
+                    for (var i in contents) {
+                        //Checking for file or directory
+                        if (contents[i].isDirectory) {
+                            //Recursive call if directory
+                            this.copyDirectoryToCloud(dir, contents[i], fileRoot, tracking);
+                        } else if (contents[i].isFile){
+                            //
+                            tracking.total++;
+                            //Copying file
+                            this.chromeApi.fileContent(contents[i].fullPath, function (result) {
+                                //Using binary when copying files to allow images and such to work
+                                var file = this.coreApi.createFile({uri: (fileRoot+result.file.fullPath).replace(/\/\//gi, '/'), contents: result.content});
+                                //Checking for file copy success
+                                if (file.status === 201) {
+                                    tracking.copied++;
+                                } else {
+                                    //Error
+                                    tracking.callback(false);
+                                }
+                                //Checking for all files to be copied to make callback
+                                if (tracking.copied === tracking.total && tracking.callback) {
+                                    tracking.callback(true);
+                                }
+                            }.bind(this));
+                        }
+                    }
+                }.bind(this));
+            }
+        }
     },
-        ////////////////////////////////////////////////////////////////////
+    ////////////////////////////////////////////////////////////////////
     //
     synchronize: {
-        value: function(chromeLibs, chrome) {
-                //TODO: Remove
-                window.wipeLibrary = this.deleteLibraries.bind(this);
-                //Getting instance of browser file API
-                this.chromeApi = chrome;
-                //Local variables
-                var i, l, libs, libjson, xhr = new XMLHttpRequest(), tocopylibs = [];
+        value: function(chromeLibs, chrome) {
+            //TODO: Remove
+            window.wipeLibrary = this.deleteLibraries.bind(this);
+            //Getting instance of browser file API
+            this.chromeApi = chrome;
+            //Local variables
+            var i, l, libs, libjson, xhr = new XMLHttpRequest(), tocopylibs = [];
             //Getting known json list of libraries to copy to chrome (will be on a CDN later)
-                xhr.open("GET", '/js/io/system/ninjalibrary.json', false);
+            xhr.open("GET", '/js/io/system/ninjalibrary.json', false);
             xhr.send();
             //Checkng for correct reponse
             if (xhr.readyState === 4) {