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>

3 files changed, 43 insertions, 43 deletions

diff --git a/js/mediators/drag-drop-mediator.js b/js/mediators/drag-drop-mediator.js
index 7669dcfc..cacdcbb6 100755
--- a/js/mediators/drag-drop-mediator.js
+++ b/js/mediators/drag-drop-mediator.js
@@ -37,7 +37,7 @@ exports.DragDropMediator = Montage.create(Component, {
         value: null,
         writable: true
     },
-    
+
     dropDelegate: {
         value: null
     },
@@ -80,8 +80,8 @@ exports.DragDropMediator = Montage.create(Component, {
 
     handleDropEvent: {
         value: function(e){
-                //
-                var i, files = e.dataTransfer.files, position = {x: e.offsetX, y: e.offsetY}, self = this;
+            //
+            var i, files = e.dataTransfer.files, position = {x: e.offsetX, y: e.offsetY}, self = this;
 
             var xferString = e.dataTransfer.getData("text/plain");
             if(xferString) {
@@ -93,17 +93,17 @@ exports.DragDropMediator = Montage.create(Component, {
                     }
                 }
             }
-                //
-                for (i=0; files[i]; i++) {
-                        if (files[i].type.indexOf('image') !== -1) {
+            //
+            for (i=0; files[i]; i++) {
+                if (files[i].type.indexOf('image') !== -1) {
                         this.application.ninja.ioMediator.createFileFromBinary(files[i], {"addFileToStage" : self.addImageElement.bind(self), "position": position});
 
-                        } else {
-                                //TODO: NOT AN IMAGE, HANDLE SPECIAL CASE
-                        }
-                }
-                //Not sure why return value should be, seemed as false to work
-                return false;
+                } else {
+                    //TODO: NOT AN IMAGE, HANDLE SPECIAL CASE
+                }
+            }
+            //Not sure why return value should be, seemed as false to work
+            return false;
         }
     },
 
diff --git a/js/mediators/io-mediator.js b/js/mediators/io-mediator.js
index c69cbafa..af0f4dd6 100644
--- a/js/mediators/io-mediator.js
+++ b/js/mediators/io-mediator.js
@@ -30,11 +30,11 @@ POSSIBILITY OF SUCH DAMAGE.
 
 ////////////////////////////////////////////////////////////////////////
 //
-var Montage =                   require("montage/core/core").Montage,
-        Component =             require("montage/ui/component").Component,
-        FileIo =                        require("js/io/system/fileio").FileIo,
-        ProjectIo =             require("js/io/system/projectio").ProjectIo,
-        TemplateMediator =      require("js/document/mediators/template").TemplateDocumentMediator;
+var Montage =           require("montage/core/core").Montage,
+    Component =         require("montage/ui/component").Component,
+    FileIo =            require("js/io/system/fileio").FileIo,
+    ProjectIo =         require("js/io/system/projectio").ProjectIo,
+    TemplateMediator =  require("js/document/mediators/template").TemplateDocumentMediator;
 ////////////////////////////////////////////////////////////////////////
 //
 exports.IoMediator = Montage.create(Component, {
@@ -68,11 +68,11 @@ exports.IoMediator = Montage.create(Component, {
     ////////////////////////////////////////////////////////////////////
     //
     parseToTemplate: {
-            value: function(content, template) {
-                    //
+        value: function(content, template) {
+            //
             if (template.name.toLowerCase() === 'banner' || template.name.toLowerCase() === 'animation') {
-                //Getting dimensions of banner
-                        var dimensions = template.id.split('x');
+                //Getting dimensions of banner
+                var dimensions = template.id.split('x');
                 dimensions = {width: String(dimensions[0])+'px', height: String(dimensions[1])+'px'};
                 //
                 content = content.replace(/Dimensions@@@/gi, "Dimensions@@@"+template.id);
@@ -81,7 +81,7 @@ exports.IoMediator = Montage.create(Component, {
             }
             //
             return content;
-            }
+        }
     },
     ////////////////////////////////////////////////////////////////////
     //
@@ -113,8 +113,8 @@ exports.IoMediator = Montage.create(Component, {
             //Sending result to callback if requested for handling
             if (callback) callback(result);
             //Codes
-            //  204: File exists | 400: File exists
-            //  201: File succesfully created | 500: Unknown (Probably cloud API not running)
+            //  204: File exists | 400: File exists
+            //  201: File succesfully created | 500: Unknown (Probably cloud API not running)
         }
     },
     ////////////////////////////////////////////////////////////////////
@@ -159,9 +159,9 @@ exports.IoMediator = Montage.create(Component, {
             204: File exists (Success)
             404: File does not exists (Failure)
             500: Unknown (Probably cloud API not running)
-                
+
             (Below only present if succesfull 204)
-                
+
             Object.content
             Object.extension
             Object.name
@@ -186,9 +186,9 @@ exports.IoMediator = Montage.create(Component, {
                 case 'html':
                     //Getting content from function to properly handle saving assets (as in external if flagged)
                     if (doc.template && (doc.template.type === 'banner' || doc.template.type === 'animation')) {
-                        parsedDoc = this.tmplt.parseNinjaTemplateToHtml(true, doc, true, libCopyCallback);
+                        parsedDoc = this.tmplt.parseNinjaTemplateToHtml(true, doc, true, libCopyCallback);
                     } else {
-                        parsedDoc = this.tmplt.parseNinjaTemplateToHtml(true, doc, false, libCopyCallback);
+                        parsedDoc = this.tmplt.parseNinjaTemplateToHtml(true, doc, false, libCopyCallback);
                     }
                     break;
                 default:
@@ -196,21 +196,21 @@ exports.IoMediator = Montage.create(Component, {
                     break;
             }
             if (parsedDoc) {
-                //Making call to save file
-                save = this.fio.saveFile({uri: doc.file.uri, contents: parsedDoc.content});
-                //Checking for callback
-                if (callback) callback(save);
-                //Checking for libraries, making callback if specified
-                if (!parsedDoc.libs && libCopyCallback) libCopyCallback(true);
-                //
-                return {montageId: parsedDoc.montageId, canvasId: parsedDoc.canvasId};
+                //Making call to save file
+                save = this.fio.saveFile({uri: doc.file.uri, contents: parsedDoc.content});
+                //Checking for callback
+                if (callback) callback(save);
+                //Checking for libraries, making callback if specified
+                if (!parsedDoc.libs && libCopyCallback) libCopyCallback(true);
+                //
+                return {montageId: parsedDoc.montageId, canvasId: parsedDoc.canvasId};
             } else {
-                    //Making call to save file
-                save = this.fio.saveFile({uri: doc.file.uri, contents: content});
-                //Checking for callback
-                if (callback) callback(save);
-                //
-                return null;
+                //Making call to save file
+                save = this.fio.saveFile({uri: doc.file.uri, contents: content});
+                //Checking for callback
+                if (callback) callback(save);
+                //
+                return null;
             }
         }
     },
diff --git a/js/mediators/keyboard-mediator.js b/js/mediators/keyboard-mediator.js
index 15ee1e33..015f84e3 100755
--- a/js/mediators/keyboard-mediator.js
+++ b/js/mediators/keyboard-mediator.js
@@ -180,7 +180,7 @@ exports.KeyboardMediator = Montage.create(Component, {
                     this.application.ninja.handleSelectTool({ "detail": this.application.ninja.toolsData.defaultToolsData[this.application.ninja.toolsData.brushToolIndex] });
                     return;
                 }
-                
+
                 // Shortcut for Rectangle Tool is R
                 // unless the user is pressing the command key.
                 // If the user is pressing the command key, they want to refresh the browser.