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

diff --git a/js/components/treeview/ninja-branch.reel/ninja-branch.js b/js/components/treeview/ninja-branch.reel/ninja-branch.js
index f92a09bc..b4a096e3 100644
--- a/js/components/treeview/ninja-branch.reel/ninja-branch.js
+++ b/js/components/treeview/ninja-branch.reel/ninja-branch.js
@@ -71,7 +71,7 @@ var Branch = exports.Branch = Montage.create(TreeNode, {
         value: function() {
             this.collapser.removeAttribute('id');
             this.label._element.addEventListener('click', this, false);
-            
+
             if(this.hideLabel) {
                 this.label.element.style.display = "none";
             }
@@ -81,17 +81,17 @@ var Branch = exports.Branch = Montage.create(TreeNode, {
     },
     handleWebkitTransitionEnd : {
         value: function(e) {
-            e.stopPropagation(); 
-            
+            e.stopPropagation();
+
             ///// Remove Transition
             this._removeTransition = true;
             this.collapser.removeEventListener('webkitTransitionEnd', this, false);
-            
+
             //// If it's an expand transition, restore height to auto
             if(this.isExpanded) {
                 this._switchToAuto = true;
             }
-            
+
             this.needsDraw = true;
 
         }
@@ -114,9 +114,9 @@ var Branch = exports.Branch = Montage.create(TreeNode, {
             if (this.sourceObject[this.labelKey]) {
                 this._labelText = this.sourceObject[this.labelKey];
             }
-            
+
             if(this._doCollapse) {
-                if (this._step === 0) {                    
+                if (this._step === 0) {
                     this.collapser.style.height = this.branchHeight;
                     this.collapser.style.position = "relative";
                     this.collapser.style.overflow = 'hidden';
@@ -135,15 +135,15 @@ var Branch = exports.Branch = Montage.create(TreeNode, {
                 }
             } else if(this._doExpand) {
                 this.collapser.style.height = this.branchHeight;
-                
+
                 this._doExpand = false;
             }
             if(this._switchToAuto) {
                 this.collapser.childNodes[1].style.position = 'static';
-                this.collapser.style.height = 'auto';                    
+                this.collapser.style.height = 'auto';
                 this._switchToAuto = false;
             }
-            
+
             if(this._removeTransition) {
                 this.collapser.classList.remove(this.collapseClass);
                 this._removeTransition = false;
@@ -167,7 +167,7 @@ var Branch = exports.Branch = Montage.create(TreeNode, {
     },
     collapse : {
         value: function() {
-            this.needsDraw = this._doCollapse = true;            
+            this.needsDraw = this._doCollapse = true;
         }
     },
     branchHeight: {