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

diff --git a/js/panels/color/colorpanelbase.reel/colorpanelbase.js b/js/panels/color/colorpanelbase.reel/colorpanelbase.js
index 0223b9d8..b7fbb859 100755
--- a/js/panels/color/colorpanelbase.reel/colorpanelbase.js
+++ b/js/panels/color/colorpanelbase.reel/colorpanelbase.js
@@ -30,12 +30,12 @@ POSSIBILITY OF SUCH DAMAGE.
 
 ////////////////////////////////////////////////////////////////////////
 //
-var Montage =                   require("montage/core/core").Montage,
-        Component =             require("montage/ui/component").Component,
-        Popup =                         require("js/components/popup.reel").Popup,
-        Slider =                        require("js/components/slider.reel").Slider,
-        HotText =                       require("js/components/hottext.reel").HotText,
-        ColorBar =                      require("js/components/colorbar.reel").ColorBar;
+var Montage =           require("montage/core/core").Montage,
+    Component =         require("montage/ui/component").Component,
+    Popup =             require("js/components/popup.reel").Popup,
+    Slider =            require("js/components/slider.reel").Slider,
+    HotText =           require("js/components/hottext.reel").HotText,
+    ColorBar =          require("js/components/colorbar.reel").ColorBar;
 ////////////////////////////////////////////////////////////////////////
 //Exporting as ColorPanelBase
 exports.ColorPanelBase = Montage.create(Component, {
@@ -47,7 +47,7 @@ exports.ColorPanelBase = Montage.create(Component, {
     ////////////////////////////////////////////////////////////////////
     //Storing ColorPanel sliders mode
     _panelMode: {
-            value: 'rgb'
+        value: 'rgb'
     },
     ////////////////////////////////////////////////////////////////////
     //Storing ColorPanel sliders mode
@@ -505,11 +505,11 @@ exports.ColorPanelBase = Montage.create(Component, {
                         if (c && c.css) {
                             this.ctx.clearRect(0, 0, this.cvs.width, this.cvs.height);
                             if (m === 'gradient') {
-                                this.style.backgroundImage = c.css;
-                                this.style.backgroundColor = 'transparent';
+                                this.style.backgroundImage = c.css;
+                                this.style.backgroundColor = 'transparent';
                             } else {
-                                    this.style.backgroundColor = c.css;
-                                    this.style.backgroundImage = 'none';
+                                this.style.backgroundColor = c.css;
+                                this.style.backgroundImage = 'none';
                             }
                         } else {
                             this.drawNoColor(this, this.cvs);
@@ -559,7 +559,7 @@ exports.ColorPanelBase = Montage.create(Component, {
                         this.drawButtonNoColor(button, button.getElementsByTagName('canvas')[0]);
                     }
                     break;
-                //////////////////////////////////////////////////////// 
+                ////////////////////////////////////////////////////////
                 case 'fillicon':
                     button.innerHTML = '';
                     this._buttons.fill.push(button);
@@ -572,7 +572,7 @@ exports.ColorPanelBase = Montage.create(Component, {
                         button.className = button.className + ' selected';
                     }
                     break;
-                //////////////////////////////////////////////////////// 
+                ////////////////////////////////////////////////////////
                 case 'stroke':
                     this._buttons.stroke.push(button);
                     button.style.cursor = 'pointer';
@@ -602,7 +602,7 @@ exports.ColorPanelBase = Montage.create(Component, {
                         //this.selectInputHighlight(this._buttons['stroke'], this._buttons['fill'], false, true);
                     }
                     break;
-                //////////////////////////////////////////////////////// 
+                ////////////////////////////////////////////////////////
                 case 'strokeicon':
                     button.innerHTML = '';
                     this._buttons.stroke.push(button);
@@ -615,7 +615,7 @@ exports.ColorPanelBase = Montage.create(Component, {
                         button.className = button.className + ' selected';
                     }
                     break;
-                //////////////////////////////////////////////////////// 
+                ////////////////////////////////////////////////////////
                 case 'current':
                     this._buttons.current.push(button);
                     button.style.cursor = 'default';
@@ -636,7 +636,7 @@ exports.ColorPanelBase = Montage.create(Component, {
                         }
                     }
                     break;
-                //////////////////////////////////////////////////////// 
+                ////////////////////////////////////////////////////////
                 case 'previous':
                     this._buttons.previous.push(button);
                     button.addEventListener('click', this.setPreviousColor.bind(this));
@@ -657,49 +657,49 @@ exports.ColorPanelBase = Montage.create(Component, {
                         }
                     }
                     break;
-                //////////////////////////////////////////////////////// 
+                ////////////////////////////////////////////////////////
                 case 'mlabel1':
                     this._buttons.mlabel1.push(button);
                     break;
-                //////////////////////////////////////////////////////// 
+                ////////////////////////////////////////////////////////
                 case 'mlabel2':
                     this._buttons.mlabel2.push(button);
                     break;
-                //////////////////////////////////////////////////////// 
+                ////////////////////////////////////////////////////////
                 case 'mlabel3':
                     this._buttons.mlabel3.push(button);
                     break;
-                //////////////////////////////////////////////////////// 
+                ////////////////////////////////////////////////////////
                 case 'rgbmode':
                     this._buttons.rgbmode.push(button);
                     button.title = 'Color Mode: RGB';
                     button.addEventListener('click', this.rgbMode.bind(this));
                     break;
-                //////////////////////////////////////////////////////// 
+                ////////////////////////////////////////////////////////
                 case 'hslmode':
                     this._buttons.hslmode.push(button);
                     button.title = 'Color Mode: HSL';
                     button.addEventListener('click', this.hslMode.bind(this));
                     break;
-                //////////////////////////////////////////////////////// 
+                ////////////////////////////////////////////////////////
                 case 'reset':
                     this._buttons.reset.push(button);
                     button.title = 'Default Colors';
                     button.addEventListener('click', this.applyDefaultColors.bind(this));
                     break;
-                //////////////////////////////////////////////////////// 
+                ////////////////////////////////////////////////////////
                 case 'nocolor':
                     this._buttons.nocolor.push(button);
                     button.title = 'No Color';
                     button.addEventListener('click', function () {this.setNoColor(false)}.bind(this));
                     break;
-                //////////////////////////////////////////////////////// 
+                ////////////////////////////////////////////////////////
                 case 'swap':
                     this._buttons.swap.push(button);
                     button.title = 'Swap Colors';
                     button.addEventListener('click', this.swapColors.bind(this));
                     break;
-                //////////////////////////////////////////////////////// 
+                ////////////////////////////////////////////////////////
                 case 'hexinput':
                     var hexinp = HotText.create();
                     hexinp.element = button;
@@ -709,7 +709,7 @@ exports.ColorPanelBase = Montage.create(Component, {
                     this._buttons.hexinput.push(hexinp);