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

diff --git a/js/panels/Timeline/Keyframe.reel/Keyframe.js b/js/panels/Timeline/Keyframe.reel/Keyframe.js
index 9ded9c76..201b912c 100644
--- a/js/panels/Timeline/Keyframe.reel/Keyframe.js
+++ b/js/panels/Timeline/Keyframe.reel/Keyframe.js
@@ -70,12 +70,12 @@ var Keyframe = exports.Keyframe = Montage.create(Component, {
     prepareForDraw:{
         value:function(){
             this.element.addEventListener("click", this, false);
-            
-                        // Drag and drop event handlers
-                        this.element.addEventListener("mouseover", this.handleMouseover.bind(this), false);
-                        this.element.addEventListener("mouseout", this.handleMouseout.bind(this), false);
-                        this.element.addEventListener("dragstart", this.handleDragstart.bind(this), false);
-                        this.element.addEventListener("dragend", this.handleDragend.bind(this), false);
+
+            // Drag and drop event handlers
+            this.element.addEventListener("mouseover", this.handleMouseover.bind(this), false);
+            this.element.addEventListener("mouseout", this.handleMouseout.bind(this), false);
+            this.element.addEventListener("dragstart", this.handleDragstart.bind(this), false);
+            this.element.addEventListener("dragend", this.handleDragend.bind(this), false);
         }
     },
 
@@ -124,39 +124,39 @@ var Keyframe = exports.Keyframe = Montage.create(Component, {
             ev.stopPropagation();
         }
     },
-    
-        handleMouseover: {
-                value: function(event) {
-                        this.element.draggable = true;
-                }
-        },
-        handleMouseout: {
-                value: function(event) {
-                        this.element.draggable = false;
-                }
-        },
-        handleDragstart: {
-                value: function(event) {
-                        //this.parentComponent.parentComponent.dragLayerID = this.layerID;
+
+    handleMouseover: {
+        value: function(event) {
+            this.element.draggable = true;
+        }
+    },
+    handleMouseout: {
+        value: function(event) {
+            this.element.draggable = false;
+        }
+    },
+    handleDragstart: {
+        value: function(event) {
+            //this.parentComponent.parentComponent.dragLayerID = this.layerID;
             event.dataTransfer.setData('Text', 'Keyframe');
-            
+
             // Get my index in my track's tween array
             var i = 0,
-                tweenRepetitionLength = this.parentComponent.parentComponent.parentComponent.tweenRepetition.childComponents.length,
-                myIndex = null;
+                tweenRepetitionLength = this.parentComponent.parentComponent.parentComponent.tweenRepetition.childComponents.length,
+                myIndex = null;
             for (i = 0; i < tweenRepetitionLength; i++) {
-                if (this.parentComponent.parentComponent.parentComponent.tweenRepetition.childComponents[i].uuid === this.parentComponent.uuid) {
-                        myIndex = i;
-                }
+                if (this.parentComponent.parentComponent.parentComponent.tweenRepetition.childComponents[i].uuid === this.parentComponent.uuid) {
+                    myIndex = i;
+                }
             }
             this.parentComponent.parentComponent.parentComponent.draggingIndex = myIndex;
             this.selectKeyframe();
-                }
-        },
-        handleDragend: {
-                value: function(event) {
-                        this.parentComponent.isDragging = false;
-                }
-        }
-    
+        }
+    },
+    handleDragend: {
+        value: function(event) {
+            this.parentComponent.isDragging = false;
+        }
+    }
+
 });