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

diff --git a/js/controllers/elements/element-controller.js b/js/controllers/elements/element-controller.js
index 39efcf0c..59ac238c 100755
--- a/js/controllers/elements/element-controller.js
+++ b/js/controllers/elements/element-controller.js
@@ -36,22 +36,22 @@ exports.ElementController = Montage.create(Component, {
 
     addElement: {
         value: function(el, styles) {
-        
-                if (el.getAttribute) el.setAttribute('data-ninja-node', 'true');
-                
-                // Updated to use new methods in TimelinePanel. JR.
-                var insertionIndex = this.application.ninja.timeline.getInsertionIndex();
-                if (insertionIndex === false) {
-                        this.application.ninja.currentDocument.model.domContainer.appendChild(el);
-                } else {
-                        if (insertionIndex === 0) {
-                                this.application.ninja.currentDocument.model.domContainer.appendChild(el);
-                        } else {
+
+            if (el.getAttribute) el.setAttribute('data-ninja-node', 'true');
+
+            // Updated to use new methods in TimelinePanel. JR.
+            var insertionIndex = this.application.ninja.timeline.getInsertionIndex();
+            if (insertionIndex === false) {
+                this.application.ninja.currentDocument.model.domContainer.appendChild(el);
+            } else {
+                if (insertionIndex === 0) {
+                    this.application.ninja.currentDocument.model.domContainer.appendChild(el);
+                } else {
                     var element = this.application.ninja.timeline.arrLayers[insertionIndex].layerData.stageElement;
                     element.parentNode.insertBefore(el, element.nextSibling);
-                        }
-                }
-                
+                }
+            }
+
             if(styles) {
                 this.application.ninja.stylesController.setElementStyles(el, styles);
             }
@@ -67,7 +67,7 @@ exports.ElementController = Montage.create(Component, {
             el.parentNode.removeChild(el);
         }
     },
-    
+
     getProperty: {
         value: function(el, prop, fallbackOnComputed, isStageElement) {
             if(el.nodeType !== 3){