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

diff --git a/js/panels/Timeline/Span.reel/Span.js b/js/panels/Timeline/Span.reel/Span.js
index 0d013fe5..7c959fad 100644
--- a/js/panels/Timeline/Span.reel/Span.js
+++ b/js/panels/Timeline/Span.reel/Span.js
@@ -29,7 +29,7 @@ POSSIBILITY OF SUCH DAMAGE.
 </copyright> */
 
 var Montage = require("montage/core/core").Montage,
-        Component = require("montage/ui/component").Component;
+    Component = require("montage/ui/component").Component;
 
 var Span = exports.Span = Montage.create(Component, {
 
@@ -37,7 +37,7 @@ var Span = exports.Span = Montage.create(Component, {
         value: true
     },
 
-        // BEGIN: Models
+    // BEGIN: Models
     _spanWidth:{
         value:0
     },
@@ -51,185 +51,185 @@ var Span = exports.Span = Montage.create(Component, {
             this.needsDraw = true;
         }
     },
-    
+
     _isHighlighted: {
-        value: false
+        value: false
     },
     isHighlighted: {
-        get: function() {
-                return this._isHighlighted;
-        },
-        set: function(newVal) {
-                if (newVal !== this._isHighlighted) {
-                        this._isHighlighted = newVal;
-                        this.needsDraw = true;
-                }
-        }
+        get: function() {
+            return this._isHighlighted;
+        },
+        set: function(newVal) {
+            if (newVal !== this._isHighlighted) {
+                this._isHighlighted = newVal;
+                this.needsDraw = true;
+            }
+        }
     },
-    
+
     _areChoicesVisible: {
-        value: false
+        value: false
     },
     areChoicesVisible: {
-        get: function() {
-                return this._areChoicesVisible;
-        },
-        set: function(newVal) {
-                if (newVal !== this._areChoicesVisible) {
-                        this._areChoicesVisible = newVal;
-                        this.needsDraw = true;
-                }
-        }
+        get: function() {
+            return this._areChoicesVisible;
+        },
+        set: function(newVal) {
+            if (newVal !== this._areChoicesVisible) {
+                this._areChoicesVisible = newVal;
+                this.needsDraw = true;
+            }
+        }
     },
-    
+
     _easing: {
-        value: "none"
+        value: "none"
     },
     easing: {
-        get: function() {
-                return this._easing;
-        },
-        set: function(newVal) {
-                if (newVal !== this._easing) {
-                        if (typeof(newVal) === "undefined") {
-                                newVal = "none";
-                        }
-                        this._easing = newVal;
-                        this.parentComponent.easing = this.easing;
-                        this.parentComponent.tweenData.easing = this.easing;
-                        this.parentComponent.setKeyframeEase(newVal);
-                        this.needsDraw = true;
-                }
-        }
+        get: function() {
+            return this._easing;
+        },
+        set: function(newVal) {
+            if (newVal !== this._easing) {
+                if (typeof(newVal) === "undefined") {
+                    newVal = "none";
+                }
+                this._easing = newVal;
+                this.parentComponent.easing = this.easing;
+                this.parentComponent.tweenData.easing = this.easing;
+                this.parentComponent.setKeyframeEase(newVal);
+                this.needsDraw = true;
+            }
+        }
+    },
+
+    // BEGIN: draw cycle
+    prepareForDraw: {
+        value: function() {
+            this.init();
+        }
     },
-        
-        // BEGIN: draw cycle
-        prepareForDraw: {
-                value: function() {
-                        this.init();
-                }
-        },
-        
+
     draw:{
         value: function(){
             this.element.style.width = this.spanWidth + "px";
 
             if ((this.spanWidth <= 70) && (this.spanWidth >0)) {
-                var containerWidth = this.spanWidth -18,
-                        choiceWidth;
-                if (containerWidth < 0) {
-                        containerWidth = 0;
-                }
-                choiceWidth = containerWidth -3;
-                if (choiceWidth < 0) {
-                        choiceWidth = 0;
-                }
-                this.container_easing.style.width = containerWidth + "px";
-                this.easing_choice.style.width = choiceWidth + "px";
-                this.easing_choice.style.overflow = "hidden";
+                var containerWidth = this.spanWidth -18,
+                    choiceWidth;
+                if (containerWidth < 0) {
+                    containerWidth = 0;
+                }
+                choiceWidth = containerWidth -3;
+                if (choiceWidth < 0) {
+                    choiceWidth = 0;
+                }
+                this.container_easing.style.width = containerWidth + "px";
+                this.easing_choice.style.width = choiceWidth + "px";
+                this.easing_choice.style.overflow = "hidden";
             }
-                        if (this.spanWidth > 70) {
-                this.container_easing.setAttribute("style", "");
-                this.easing_choice.setAttribute("style", "");
+            if (this.spanWidth > 70) {
+                this.container_easing.setAttribute("style", "");
+                this.easing_choice.setAttribute("style", "");
             }
-            
+
             // Highlight the span?
             if (this.isHighlighted === true) {
-                this.element.classList.add("spanHighlight");
+                this.element.classList.add("spanHighlight");
             } else {
-                this.element.classList.remove("spanHighlight");
+                this.element.classList.remove("spanHighlight");
             }
-            
+
             /*
             // Hide or show the choices menu?
             if (this.areChoicesVisible === true) {
-                this.easing_choices.style.display = "block";
+                this.easing_choices.style.display = "block";
             } else {
-                this.easing_choices.style.display = "none";
+                this.easing_choices.style.display = "none";
             }
             */
-            
+
             // Change easing?
             if (this.easing_choice.innerText !== this.easing) {
-                this.easing_choice.innerText = this.easing;
+                this.easing_choice.innerText = this.easing;
             }
-            
+
         }
     },
 
-        // BEGIN: Controllers
-        init: {
-                value: function() {
-                        this.easing_choice.addEventListener("click", this.handleEasingChoiceClick.bind(this), false);
-                        //this.easing_choices.addEventListener("click", this.handleEasingChoicesClick.bind(this), false);
+    // BEGIN: Controllers
+    init: {
+        value: function() {
+            this.easing_choice.addEventListener("click", this.handleEasingChoiceClick.bind(this), false);
+            //this.easing_choices.addEventListener("click", this.handleEasingChoicesClick.bind(this), false);
+
+        }
+    },
 
-                }
-        },
-        
     highlightSpan:{
         value: function(){
-                // Class add/remove should only be done in draw cycle.
+            // Class add/remove should only be done in draw cycle.
             // this.element.classList.add("spanHighlight");
             this.isHighlighted = true;
         }