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

diff --git a/js/panels/Timeline/Tween.reel/Tween.js b/js/panels/Timeline/Tween.reel/Tween.js
index ff8d0bad..c451caa7 100644
--- a/js/panels/Timeline/Tween.reel/Tween.js
+++ b/js/panels/Timeline/Tween.reel/Tween.js
@@ -165,38 +165,38 @@ var Tween = exports.Tween = Montage.create(Component, {
             this._isTweenAnimated = value;
         }
     },
-    
+
     _isDragging: {
-        value: false
+        value: false
     },
     isDragging: {
-        serializable: true,
+        serializable: true,
         get:function () {
             return this._isDragging;
         },
         set:function (newVal) {
             this._isDragging = newVal;
         }
-        
+
     },
-    
+
     _easing: {
-        value: "none"
+        value: "none"
     },
     easing: {
-        serializable: true,
+        serializable: true,
         get:function () {
             return this._easing;
         },
         set:function (newVal) {
             this._easing = newVal;
         }
-        
+
     },
 
     draw:{
         value:function () {
-                this.tweenspan.element.style.width = this.spanWidth + "px";
+            this.tweenspan.element.style.width = this.spanWidth + "px";
             this.keyframe.element.style.left = (this.spanWidth -5) + "px";
             this.tweenspan.spanWidth = this.spanWidth;
             this.element.style.left = this.spanPosition + "px";
@@ -225,7 +225,7 @@ var Tween = exports.Tween = Montage.create(Component, {
     handleElementChange:{
         value:function (event) {
             // temp - testing var
-                var useAbsolute = true;
+            var useAbsolute = true;
 
             if(event.detail.type === "cssChange"){
                 event.detail.source="cssPanelChange"
@@ -250,32 +250,32 @@ var Tween = exports.Tween = Montage.create(Component, {
     setTweenProperties:{
         value:function (eventDetail) {
 
-                if (eventDetail.source === "SelectionTool" || eventDetail.source === "timeline" || eventDetail.source === "pi" || eventDetail.source === "cssPanelChange") {
-                    if(this.parentComponent.parentComponent.animatedElement.offsetTop != this.tweenedProperties["top"]){
-                        this.tweenedProperties["top"] = this.parentComponent.parentComponent.animatedElement.offsetTop + "px";
-                    }
-                    if(this.parentComponent.parentComponent.animatedElement.offsetLeft != this.tweenedProperties["left"]){
-                        this.tweenedProperties["left"] = this.parentComponent.parentComponent.animatedElement.offsetLeft + "px";
-                    }
-                    if (this.parentComponent.parentComponent.animatedElement.offsetWidth != this.tweenedProperties["width"]){
-                        this.tweenedProperties["width"] = this.parentComponent.parentComponent.animatedElement.offsetWidth + "px";
-                    }
-                    if (this.parentComponent.parentComponent.animatedElement.offsetHeight != this.tweenedProperties["height"]){
-                        this.tweenedProperties["height"] = this.parentComponent.parentComponent.animatedElement.offsetHeight + "px";
-                    }
-                    // tell track to update css rule
-                    this.parentComponent.parentComponent.updateKeyframeRule();
-                    this.isTweenAnimated = true;
-                }
-                        
-                        if (eventDetail.source === "translateTool") {
-                        var arrMat = eventDetail.data.value[0].properties.mat,
-                                strTweenProperty = "perspective(1400) matrix3d(" + arrMat.join() + ")";
-                        
-                        this.tweenedProperties["-webkit-transform"] = strTweenProperty;
-                        this.parentComponent.parentComponent.updateKeyframeRule();
-                        this.isTweenAnimated = true;
-                }
+            if (eventDetail.source === "SelectionTool" || eventDetail.source === "timeline" || eventDetail.source === "pi" || eventDetail.source === "cssPanelChange") {
+                if(this.parentComponent.parentComponent.animatedElement.offsetTop != this.tweenedProperties["top"]){
+                    this.tweenedProperties["top"] = this.parentComponent.parentComponent.animatedElement.offsetTop + "px";
+                }
+                if(this.parentComponent.parentComponent.animatedElement.offsetLeft != this.tweenedProperties["left"]){
+                    this.tweenedProperties["left"] = this.parentComponent.parentComponent.animatedElement.offsetLeft + "px";
+                }
+                if (this.parentComponent.parentComponent.animatedElement.offsetWidth != this.tweenedProperties["width"]){
+                    this.tweenedProperties["width"] = this.parentComponent.parentComponent.animatedElement.offsetWidth + "px";
+                }
+                if (this.parentComponent.parentComponent.animatedElement.offsetHeight != this.tweenedProperties["height"]){
+                    this.tweenedProperties["height"] = this.parentComponent.parentComponent.animatedElement.offsetHeight + "px";
+                }
+                // tell track to update css rule
+                this.parentComponent.parentComponent.updateKeyframeRule();
+                this.isTweenAnimated = true;
+            }
+
+            if (eventDetail.source === "translateTool") {
+                var arrMat = eventDetail.data.value[0].properties.mat,
+                    strTweenProperty = "perspective(1400) matrix3d(" + arrMat.join() + ")";
+
+                this.tweenedProperties["-webkit-transform"] = strTweenProperty;
+                this.parentComponent.parentComponent.updateKeyframeRule();
+                this.isTweenAnimated = true;
+            }
         }
     },