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>

9 files changed, 1441 insertions, 1441 deletions

diff --git a/js/panels/color/colorbutton-manager.js b/js/panels/color/colorbutton-manager.js
index 7294ce93..0f1ce4a0 100755
--- a/js/panels/color/colorbutton-manager.js
+++ b/js/panels/color/colorbutton-manager.js
@@ -27,18 +27,18 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 </copyright> */
- 
+
 ////////////////////////////////////////////////////////////////////////
 //
-var Montage =                   require("montage/core/core").Montage,
-        Component =                     require("montage/ui/component").Component;
+var Montage =           require("montage/core/core").Montage,
+    Component =         require("montage/ui/component").Component;
 ////////////////////////////////////////////////////////////////////////
 //Exporting as ColorPopupManager
 exports.ColorButtonManager = Montage.create(Component, {
     ////////////////////////////////////////////////////////////////////
     //
     hasTemplate: {
-        value: false
+        value: false
     },
     ////////////////////////////////////////////////////////////////////
     //Storing color manager
@@ -49,19 +49,19 @@ exports.ColorButtonManager = Montage.create(Component, {
     ////////////////////////////////////////////////////////////////////
     //
     colorManager: {
-        enumerable: true,
+        enumerable: true,
         get: function() {
             return this._colorManager;
         },
         set: function(value) {
-                this._colorManager = value;
+            this._colorManager = value;
         }
     },
     ////////////////////////////////////////////////////////////////////
     //
     _buttons: {
-        enumerable: false,
-        value: {chip: [], fill: [], stroke: [], current: [], previous: [], rgbmode: [], hslmode: [], hexinput: [], nocolor: [], reset: [], swap: [], mlabel1: [], mlabel2: [], mlabel3: []}
+        enumerable: false,
+        value: {chip: [], fill: [], stroke: [], current: [], previous: [], rgbmode: [], hslmode: [], hexinput: [], nocolor: [], reset: [], swap: [], mlabel1: [], mlabel2: [], mlabel3: []}
     }
     ////////////////////////////////////////////////////////////////////
     ////////////////////////////////////////////////////////////////////
diff --git a/js/panels/color/colorpanel.js b/js/panels/color/colorpanel.js
index 7815030e..988a7230 100755
--- a/js/panels/color/colorpanel.js
+++ b/js/panels/color/colorpanel.js
@@ -30,18 +30,18 @@ POSSIBILITY OF SUCH DAMAGE.
 
 ////////////////////////////////////////////////////////////////////////
 //
-var Montage =   require("montage/core/core").Montage,
-    PanelBase = require("js/panels/panelbase").PanelBase;
+var Montage =   require("montage/core/core").Montage,
+    PanelBase = require("js/panels/panelbase").PanelBase;
 ////////////////////////////////////////////////////////////////////////
 //Exporting as ColorPanel
 exports.ColorPanel = Montage.create(PanelBase, {
     ////////////////////////////////////////////////////////////////////
     //Panel Configuration
-    panelName:                  {value: "Color",                                        writable: true, enumerable: true, configurable: true},
-    panelHeaderID:              {value: "colorPanelHeader",             writable: true, enumerable: true, configurable: true},
-    disclosureIconID:   {value: "colorPanelDisclosureIcon",     writable: true, enumerable: true, configurable: true},
-    closeButtonID:              {value: "colorPanelCloseButton",        writable: true, enumerable: true, configurable: true},
-    panelContentID:     {value: "colorPanelContent",            writable: true, enumerable: true, configurable: true},
+    panelName:          {value: "Color",                    writable: true, enumerable: true, configurable: true},
+    panelHeaderID:      {value: "colorPanelHeader",         writable: true, enumerable: true, configurable: true},
+    disclosureIconID:   {value: "colorPanelDisclosureIcon", writable: true, enumerable: true, configurable: true},
+    closeButtonID:      {value: "colorPanelCloseButton",    writable: true, enumerable: true, configurable: true},
+    panelContentID:     {value: "colorPanelContent",        writable: true, enumerable: true, configurable: true},
     ////////////////////////////////////////////////////////////////////
     //Creating panel from base view class
     init: {
diff --git a/js/panels/color/colorpanelbase.reel/colorpanelbase.html b/js/panels/color/colorpanelbase.reel/colorpanelbase.html
index 5918a3ae..5ec6cd01 100755
--- a/js/panels/color/colorpanelbase.reel/colorpanelbase.html
+++ b/js/panels/color/colorpanelbase.reel/colorpanelbase.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <!-- <copyright>
 Copyright (c) 2012, Motorola Mobility, Inc
 All Rights Reserved.
@@ -29,12 +29,12 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 </copyright> -->
 <html lang="en">
-        <head>
-        
-        <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-        
-        <link rel="stylesheet" type="text/css" href="css/colorpanelbase.css">
-                <script type="text/montage-serialization">
+    <head>
+
+        <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+
+        <link rel="stylesheet" type="text/css" href="css/colorpanelbase.css">
+        <script type="text/montage-serialization">
         {
             "owner": {
                 "prototype": "js/panels/Color/ColorPanelBase.reel",
@@ -68,57 +68,57 @@ POSSIBILITY OF SUCH DAMAGE.
                 }
             }
 
-        }
-                </script>
-                
-        </head>
-        
-        <body>
-    
-        <div data-montage-id="cp_expanded" class="cp_expanded">
-                <div class="cp_history">
-                        <button data-montage-id="btn_current" class="cp_color_current">Current Color</button>
-                        <button data-montage-id="btn_previous" class="cp_color_previous">Previous Color</button>
-                        </div>
-                <div class="cp_modes">
-                        <button data-montage-id="btn_rgb" class="cp_rgb_mode">RGB</button>
-                        <hr />
-                                <button data-montage-id="btn_hsl" class="cp_hsl_mode">HSL</button>
-                </div>
-                <hr />
-                <div class="cp_inputs">
-                        <div class="cp_input_button"><button data-montage-id="btn_stroke" class="cpe_stroke">Stroke</button></div>
-                        <button data-montage-id="btn_istoke" class="cpe_stroke_icon"></button>
-                        <div class="cp_input_button"><button data-montage-id="btn_fill" class="cpe_fill">Fill</button></div>
-                        <button data-montage-id="btn_ifill" class="cpe_fill_icon"></button>
-                </div>
-                <div class="cp_options">
-                        <button data-montage-id="btn_default" class="cp_reset">Default Colors</button>
-                        <button data-montage-id="btn_nocolor" class="cp_nocolor">No Color</button>
-                        <button data-montage-id="btn_swap" class="cp_swap">Swap Colors</button>
-                </div>
-                <div class="cp_labels">
-                        <div data-montage-id="label1" class="sh_label1">R</div>
-                        <div data-montage-id="label2" class="sh_label2">G</div>
-                        <div data-montage-id="label3" class="sh_label3">B</div>
-                        <div data-montage-id="label4" class="sh_label4">A</div>
-                </div>
-                <div class="cp_sliders">
+        }
+        </script>
+
+    </head>
+
+    <body>
+
+        <div data-montage-id="cp_expanded" class="cp_expanded">
+            <div class="cp_history">
+                <button data-montage-id="btn_current" class="cp_color_current">Current Color</button>
+                <button data-montage-id="btn_previous" class="cp_color_previous">Previous Color</button>
+            </div>
+            <div class="cp_modes">
+                <button data-montage-id="btn_rgb" class="cp_rgb_mode">RGB</button>
+                <hr />
+                <button data-montage-id="btn_hsl" class="cp_hsl_mode">HSL</button>
+            </div>
+            <hr />
+            <div class="cp_inputs">
+                <div class="cp_input_button"><button data-montage-id="btn_stroke" class="cpe_stroke">Stroke</button></div>
+                <button data-montage-id="btn_istoke" class="cpe_stroke_icon"></button>
+                <div class="cp_input_button"><button data-montage-id="btn_fill" class="cpe_fill">Fill</button></div>
+                <button data-montage-id="btn_ifill" class="cpe_fill_icon"></button>
+            </div>
+            <div class="cp_options">
+                <button data-montage-id="btn_default" class="cp_reset">Default Colors</button>
+                <button data-montage-id="btn_nocolor" class="cp_nocolor">No Color</button>
+                <button data-montage-id="btn_swap" class="cp_swap">Swap Colors</button>
+            </div>
+            <div class="cp_labels">
+                <div data-montage-id="label1" class="sh_label1">R</div>
+                <div data-montage-id="label2" class="sh_label2">G</div>
+                <div data-montage-id="label3" class="sh_label3">B</div>
+                <div data-montage-id="label4" class="sh_label4">A</div>
+            </div>
+            <div class="cp_sliders">