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>

2 files changed, 319 insertions, 319 deletions

diff --git a/js/document/mediators/io.js b/js/document/mediators/io.js
index 85d805ad..9f56a9ea 100755
--- a/js/document/mediators/io.js
+++ b/js/document/mediators/io.js
@@ -30,19 +30,19 @@ POSSIBILITY OF SUCH DAMAGE.
 
 ////////////////////////////////////////////////////////////////////////
 //
-var Montage =   require("montage/core/core").Montage,
-        Component = require("montage/ui/component").Component;
+var Montage =   require("montage/core/core").Montage,
+    Component = require("montage/ui/component").Component;
 ////////////////////////////////////////////////////////////////////////
-//      
+//
 exports.IoDocumentMediator = Montage.create(Component, {
-        ////////////////////////////////////////////////////////////////////
-        //
-        hasTemplate: {
-                enumerable: false,
+    ////////////////////////////////////////////////////////////////////
+    //
+    hasTemplate: {
+        enumerable: false,
         value: false
     }
-        ////////////////////////////////////////////////////////////////////
-        ////////////////////////////////////////////////////////////////////
+    ////////////////////////////////////////////////////////////////////
+    ////////////////////////////////////////////////////////////////////
 });
 ////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////
diff --git a/js/document/mediators/template.js b/js/document/mediators/template.js
index 982b410f..7451ffa2 100755
--- a/js/document/mediators/template.js
+++ b/js/document/mediators/template.js
@@ -30,16 +30,16 @@ POSSIBILITY OF SUCH DAMAGE.
 
 ////////////////////////////////////////////////////////////////////////
 //
-var Montage =                   require("montage/core/core").Montage,
-        Component =             require("montage/ui/component").Component,
-        TemplateCreator =       require("node_modules/tools/template/template-creator").TemplateCreator,
-        ClassUuid =             require("js/components/core/class-uuid").ClassUuid;
+var Montage =           require("montage/core/core").Montage,
+    Component =         require("montage/ui/component").Component,
+    TemplateCreator =   require("node_modules/tools/template/template-creator").TemplateCreator,
+    ClassUuid =         require("js/components/core/class-uuid").ClassUuid;
 ////////////////////////////////////////////////////////////////////////
-//      
+//
 exports.TemplateDocumentMediator = Montage.create(Component, {
-        ////////////////////////////////////////////////////////////////////
-        //
-        hasTemplate: {
+    ////////////////////////////////////////////////////////////////////
+    //
+    hasTemplate: {
         value: false
     },
     ////////////////////////////////////////////////////////////////////
@@ -53,55 +53,55 @@ exports.TemplateDocumentMediator = Montage.create(Component, {
     ////////////////////////////////////////////////////////////////////
     //
     getDataDirectory: {
-        value: function (path) {
-                //TODO: Implement user overwrite
-                return this._getUserDirectory(path+'data/');
-        }
+        value: function (path) {
+            //TODO: Implement user overwrite
+            return this._getUserDirectory(path+'data/');
+        }
     },
     ////////////////////////////////////////////////////////////////////
     //
     getNinjaDirectory: {
-        value: function (path) {
-                //TODO: Implement user overwrite
-                return this._getUserDirectory(this.getDataDirectory(path)+'ninja/');
-        }
+        value: function (path) {
+            //TODO: Implement user overwrite
+            return this._getUserDirectory(this.getDataDirectory(path)+'ninja/');
+        }
     },
     ////////////////////////////////////////////////////////////////////
     //
     getCanvasDirectory: {
-        value: function (path) {
-                //TODO: Implement user overwrite
-                return this._getUserDirectory(this.getNinjaDirectory(path)+'canvas/');
-        }
+        value: function (path) {
+            //TODO: Implement user overwrite
+            return this._getUserDirectory(this.getNinjaDirectory(path)+'canvas/');
+        }
     },
     ////////////////////////////////////////////////////////////////////
     //
     _getUserDirectory: {
-        value: function (path) {
-                //Checking for data directory
+        value: function (path) {
+            //Checking for data directory
             var check = this.application.ninja.coreIoApi.fileExists({uri: path}), directory;
             //Creating directory if doesn't exists
             switch (check.status) {
-                case 204: //Exists
-                        directory = path;
-                        break;
-                case 404: //Doesn't exists
-                        directory = this.application.ninja.coreIoApi.createDirectory({uri: path});
-                        //Checking for success
-                        if (directory.status === 201) {
-                                directory = path;
-                        } else {
-                                //Error
-                                directory = null;
-                        }
-                        break;
-                default: //Error
-                        directory = null;
-                        break;
+                case 204: //Exists
+                    directory = path;
+                    break;
+                case 404: //Doesn't exists
+                    directory = this.application.ninja.coreIoApi.createDirectory({uri: path});
+                    //Checking for success
+                    if (directory.status === 201) {
+                        directory = path;
+                    } else {
+                        //Error
+                        directory = null;
+                    }
+                    break;
+                default: //Error
+                    directory = null;
+                    break;
             }
             //Returning the path to the directory on disk (null for any error)
             return directory;
-        }
+        }
     },
     ////////////////////////////////////////////////////////////////////
     //
@@ -109,7 +109,7 @@ exports.TemplateDocumentMediator = Montage.create(Component, {
         value: function (html) {
             //Creating temp object to mimic HTML
             var doc = window.document.implementation.createHTMLDocument(), template, docHtmlTag,
-                hackHtml = document.createElement('html'), hackTag;
+                hackHtml = document.createElement('html'), hackTag;
             //Setting content to temp
             doc.getElementsByTagName('html')[0].innerHTML = html;
             //TODO: Improve this, very bad way of copying attributes (in a pinch to get it working)
@@ -118,13 +118,13 @@ exports.TemplateDocumentMediator = Montage.create(Component, {
             docHtmlTag = doc.getElementsByTagName('html')[0];
             //Looping through the attributes to copy them
             if (hackTag) {
-                    for (var m in hackTag.attributes) {
-                                        if (hackTag.attributes[m].value) {
-                                                docHtmlTag.setAttribute(hackTag.attributes[m].name.replace(/ninjahtmlhack/gi, 'html'), hackTag.attributes[m].value.replace(/ninjahtmlhack/gi, 'html'));
-                                        }
-                                }
-                        }
-                        //Garbage collection
+                for (var m in hackTag.attributes) {
+                    if (hackTag.attributes[m].value) {
+                        docHtmlTag.setAttribute(hackTag.attributes[m].name.replace(/ninjahtmlhack/gi, 'html'), hackTag.attributes[m].value.replace(/ninjahtmlhack/gi, 'html'));
+                    }
+                }
+            }
+            //Garbage collection
             hackHtml = hackTag = null;
             //Creating return object
             return {head: doc.head.innerHTML, body: doc.body.innerHTML, document: doc};
@@ -134,42 +134,42 @@ exports.TemplateDocumentMediator = Montage.create(Component, {
     //TODO: Expand to allow more templates, clean up variables
     parseNinjaTemplateToHtml: {
         value: function (saveExternalData, template, ninjaWrapper, libCopyCallback) {
-                //TODO: Improve reference for rootUrl
+            //TODO: Improve reference for rootUrl
             var regexRootUrl,
-                rootUrl = this.application.ninja.coreIoApi.rootUrl + escape((this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1])),
-                mjsCreator = template.mjsTemplateCreator.create(),
-                mJsSerialization,
-                toremovetags = [],
-                presentNodes,
-                montageTemplate;
+                rootUrl = this.application.ninja.coreIoApi.rootUrl + escape((this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1])),
+                mjsCreator = template.mjsTemplateCreator.create(),
+                mJsSerialization,
+                toremovetags = [],
+                presentNodes,
+                montageTemplate;
             //Creating instance of template creator
             montageTemplate = mjsCreator.initWithDocument(template.document);
             //Setting up expression for parsing URLs
             regexRootUrl = new RegExp(rootUrl.replace(/\//gi, '\\\/'), 'gi');
             //Injecting head and body into old document
             if (montageTemplate._ownerSerialization.length > 0) {
-                template.file.content.document.head.innerHTML = montageTemplate._document.head.innerHTML.replace(regexRootUrl, '');
-                    template.file.content.document.body.innerHTML = montageTemplate._document.body.innerHTML.replace(regexRootUrl, '');
+                template.file.content.document.head.innerHTML = montageTemplate._document.head.innerHTML.replace(regexRootUrl, '');
+                template.file.content.document.body.innerHTML = montageTemplate._document.body.innerHTML.replace(regexRootUrl, '');