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

diff --git a/js/document/views/design.js b/js/document/views/design.js
index ed98b660..c7f57e58 100755
--- a/js/document/views/design.js
+++ b/js/document/views/design.js
@@ -30,50 +30,50 @@ POSSIBILITY OF SUCH DAMAGE.
 
 ////////////////////////////////////////////////////////////////////////
 //
-var Montage =                   require("montage/core/core").Montage,
-        BaseDocumentView =      require("js/document/views/base").BaseDocumentView,
+var Montage =           require("montage/core/core").Montage,
+    BaseDocumentView =  require("js/document/views/base").BaseDocumentView,
     ElementModel =      require("js/models/element-model");
 ////////////////////////////////////////////////////////////////////////
-//      
+//
 exports.DesignDocumentView = Montage.create(BaseDocumentView, {
-        ////////////////////////////////////////////////////////////////////
-        //
-        hasTemplate: {
+    ////////////////////////////////////////////////////////////////////
+    //
+    hasTemplate: {
         value: false
     },
     ////////////////////////////////////////////////////////////////////
-        //
+    //
     _callback: {
-        value: null
+        value: null
     },
     ////////////////////////////////////////////////////////////////////
-        //
+    //
     _viewCallback: {
         value: null
     },
     ////////////////////////////////////////////////////////////////////
-        //
+    //
     _template: {
-        value: null
+        value: null
     },
     ////////////////////////////////////////////////////////////////////
-        //
-        _bodyFragment: {
+    //
+    _bodyFragment: {
         value: null
     },
     ////////////////////////////////////////////////////////////////////
-        //
-        _headFragment: {
+    //
+    _headFragment: {
         value: null
     },
     ////////////////////////////////////////////////////////////////////
-        //
-        _observer: {
+    //
+    _observer: {
         value: {head: null, body: null}
     },
     ////////////////////////////////////////////////////////////////////
-        //
-        content: {
+    //
+    content: {
         value: null
     },
     ////////////////////////////////////////////////////////////////////
@@ -92,29 +92,29 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
         value: null
     },
     ////////////////////////////////////////////////////////////////////
-        //
+    //
     baseHref: {
         get: function() {return this._baseHref;},
         set: function(value) {this._baseHref = value;}
     },
     ////////////////////////////////////////////////////////////////////
-        //
-        _document: {
+    //
+    _document: {
         value: null
     },
     ////////////////////////////////////////////////////////////////////
-        //
+    //
     document: {
         get: function() {return this._document;},
         set: function(value) {this._document = value;}
     },
     ////////////////////////////////////////////////////////////////////
-        //
+    //
     _documentRoot: {
         value: null
     },
     ////////////////////////////////////////////////////////////////////
-        //
+    //
     documentRoot: {
         get: function() {return this._documentRoot;},
         set: function(value) {this._documentRoot = value;}
@@ -140,12 +140,12 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
     },
     ////////////////////////////////////////////////////////////////////
     //
-        initialize: {
+    initialize: {
         value: function (parent) {
-                //Creating iFrame for view
-                this.iframe = document.createElement("iframe");
-                //Setting default styles
-                this.iframe.style.border = "none";
+            //Creating iFrame for view
+            this.iframe = document.createElement("iframe");
+            //Setting default styles
+            this.iframe.style.border = "none";
             this.iframe.style.background = "#FFF";
             this.iframe.style.height = "100%";
             this.iframe.style.width = "100%";
@@ -154,190 +154,190 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
         }
     },
     ////////////////////////////////////////////////////////////////////
-        //
-        render: {
+    //
+    render: {
         value: function (callback, template, viewCallback) {
-                //TODO: Remove, this is a temp patch for webRequest API gate
-                this.application.ninja.documentController.redirectRequests = false;
-                //Storing callback for dispatch ready
-                this._callback = callback;
-                this._template = template;
+            //TODO: Remove, this is a temp patch for webRequest API gate
+            this.application.ninja.documentController.redirectRequests = false;
+            //Storing callback for dispatch ready
+            this._callback = callback;
+            this._template = template;
             this._viewCallback = viewCallback;
-                //Adding listener to know when template is loaded to then load user content
-                this.iframe.addEventListener("load", this.onTemplateLoad.bind(this), false);
-                //TODO: Add source parameter and root (optional)
-                        if (template && template.type === 'banner' && template.size) {
-                        this.iframe.src = "js/document/templates/banner/index.html";
-                } else {
-                        this.iframe.src = "js/document/templates/html/index.html";
-                }
+            //Adding listener to know when template is loaded to then load user content
+            this.iframe.addEventListener("load", this.onTemplateLoad.bind(this), false);
+            //TODO: Add source parameter and root (optional)
+            if (template && template.type === 'banner' && template.size) {
+                this.iframe.src = "js/document/templates/banner/index.html";
+            } else {
+                this.iframe.src = "js/document/templates/html/index.html";
+            }
         }
     },
     ////////////////////////////////////////////////////////////////////
-        //
+    //
     onTemplateLoad: {
         value: function (e) {
-                //TODO: Remove, this is a temp patch for webRequest API gate
-                this.application.ninja.documentController.redirectRequests = true;
-                //TODO: Add support to constructing URL with a base HREF
-                var basetag = this.content.document.getElementsByTagName('base');
-                //Removing event
-                this.iframe.removeEventListener("load", this.onTemplateLoad.bind(this), false);
-                //TODO: Improve usage of this reference
-                this.document = this.iframe.contentWindow.document;
-                //Looping through template styles and marking them with ninja data attribute for I/O clean up
-                for (var k in this.document.styleSheets) {
-                if (this.document.styleSheets[k].ownerNode && this.document.styleSheets[k].ownerNode.setAttribute) {
-                        this.document.styleSheets[k].ownerNode.setAttribute('data-ninja-template', 'true');
-                }
+            //TODO: Remove, this is a temp patch for webRequest API gate
+            this.application.ninja.documentController.redirectRequests = true;
+            //TODO: Add support to constructing URL with a base HREF
+            var basetag = this.content.document.getElementsByTagName('base');
+            //Removing event
+            this.iframe.removeEventListener("load", this.onTemplateLoad.bind(this), false);
+            //TODO: Improve usage of this reference
+            this.document = this.iframe.contentWindow.document;
+            //Looping through template styles and marking them with ninja data attribute for I/O clean up
+            for (var k in this.document.styleSheets) {
+                if (this.document.styleSheets[k].ownerNode && this.document.styleSheets[k].ownerNode.setAttribute) {
+                    this.document.styleSheets[k].ownerNode.setAttribute('data-ninja-template', 'true');
+                }
             }
             //Checking for a base URL
             if (basetag.length) {
-                if (basetag[basetag.length-1].getAttribute && basetag[basetag.length-1].getAttribute('href')) {
-                        //Setting base HREF in model
-                                this.baseHref = basetag[basetag.length-1].getAttribute('href');
-                        }
-                }
+                if (basetag[basetag.length-1].getAttribute && basetag[basetag.length-1].getAttribute('href')) {
+                    //Setting base HREF in model
+                    this.baseHref = basetag[basetag.length-1].getAttribute('href');
+                }
+            }