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

diff --git a/node_modules/tools/template/template-creator.js b/node_modules/tools/template/template-creator.js
index 9951fb02..984edd43 100755
--- a/node_modules/tools/template/template-creator.js
+++ b/node_modules/tools/template/template-creator.js
@@ -47,13 +47,13 @@ var TemplateCreator = exports.TemplateCreator = Montage.create(Template, /** @le
             return this.initWithHeadAndBodyElements(doc.head, doc.body, montageJsPath);
         }
     },
-    
+
     initWithBodyElement: {
         value: function(body, montageJsPath) {
             return this.initWithHeadAndBodyElements(null, body, montageJsPath);
         }
     },
-    
+
     initWithHeadAndBodyElements: {
         value: function(head, body, montageJsPath) {
             var serializer = this.serializer,
@@ -64,11 +64,11 @@ var TemplateCreator = exports.TemplateCreator = Montage.create(Template, /** @le
                 doc,
                 script,
                 self = this;
-            
+
             this._componentNamesIndex = {};
             this._objectNamesIndex = {};
             doc = this._document = document.implementation.createHTMLDocument("");
-            
+
             function copyNode(sourceNode, targetNode, isRootNode) {
                 var childNodes = sourceNode.childNodes,
                     childNode,
@@ -76,7 +76,7 @@ var TemplateCreator = exports.TemplateCreator = Montage.create(Template, /** @le
                     label,
                     script,
                     component = isRootNode ? null : sourceNode.controller;
-                    
+
                 if (component) {
                     label = self._generateLabelForComponent(component, Object.keys(components));
                     componentsElements[label] = component._element;
@@ -92,7 +92,7 @@ var TemplateCreator = exports.TemplateCreator = Montage.create(Template, /** @le
                     }
                 }
             }
-            
+
             if (head) {
                 doc.head.innerHTML = head.innerHTML;
             }
@@ -102,7 +102,7 @@ var TemplateCreator = exports.TemplateCreator = Montage.create(Template, /** @le
                doc.head.appendChild(script);
                doc.head.insertBefore(doc.createTextNode("\n    "), script);
             }
-            
+
             // try to make things look nice...
             var html = doc.documentElement;
             html.insertBefore(doc.createTextNode("\n"), doc.head);
@@ -112,7 +112,7 @@ var TemplateCreator = exports.TemplateCreator = Montage.create(Template, /** @le
                 // the first child is the title
                 doc.head.insertBefore(doc.createTextNode("\n    "), doc.head.firstChild);
             }
-            
+
             copyNode(body, this._document.body, true);
             this._ownerSerialization = serializer.serialize(components);
             for (var label in components) {
@@ -121,11 +121,11 @@ var TemplateCreator = exports.TemplateCreator = Montage.create(Template, /** @le
             }
             components = componentsChildComponents = null;
             this._externalObjects = serializer.getExternalObjects();
-            
+
             return this;
         }
     },
-    
+
     _componentNamesIndex: {
         value: null
     },