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

diff --git a/js/components/gradientpicker.reel/gradientpicker.js b/js/components/gradientpicker.reel/gradientpicker.js
index 4e721f96..6e239f7d 100755
--- a/js/components/gradientpicker.reel/gradientpicker.js
+++ b/js/components/gradientpicker.reel/gradientpicker.js
@@ -30,14 +30,14 @@ POSSIBILITY OF SUCH DAMAGE.
 
 ////////////////////////////////////////////////////////////////////////
 //
-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 ColorWheel
 exports.GradientPicker = Montage.create(Component, {
-        ////////////////////////////////////////////////////////////////////
-        //
-        hasTemplate: {
+    ////////////////////////////////////////////////////////////////////
+    //
+    hasTemplate: {
         value: true
     },
     ////////////////////////////////////////////////////////////////////
@@ -50,7 +50,7 @@ exports.GradientPicker = Montage.create(Component, {
     _value: {
         value: null
     },
-        ////////////////////////////////////////////////////////////////////
+    ////////////////////////////////////////////////////////////////////
     //
     value: {
         get: function() {return this._value;},
@@ -61,14 +61,14 @@ exports.GradientPicker = Montage.create(Component, {
     _mode: {
         value: 'linear'
     },
-        ////////////////////////////////////////////////////////////////////
+    ////////////////////////////////////////////////////////////////////
     //
     mode: {
         get: function() {return this._mode;},
         set: function(value) {
-                //
-                this.application.ninja.colorController.colorPopupManager.hideGradientChipPopup();
-                //
+            //
+            this.application.ninja.colorController.colorPopupManager.hideGradientChipPopup();
+            //
             this._mode = value;
             //
             this._dispatchEvent('change', false);
@@ -77,286 +77,286 @@ exports.GradientPicker = Montage.create(Component, {
     ////////////////////////////////////////////////////////////////////
     //
     _trackData: {
-            value: {width: 0, x: 0, y: 0}
+        value: {width: 0, x: 0, y: 0}
     },
     ////////////////////////////////////////////////////////////////////
     //
     prepareForDraw: {
-        value: function() {
-                //
-                }
+        value: function() {
+            //
+        }
     },
     ////////////////////////////////////////////////////////////////////
     //
     willDraw: {
-        value: function() {
-                //Getting component views from layout
-                this._trackData.width = parseInt(getComputedStyle(this.trackChips).getPropertyCSSValue('width').cssText);
-                //TODO: Fix events and remove this hack
-                this.trackCover.addEventListener('mouseover', function () {
-                                if (!this._updating) {                  
-                                this.trackCover.style.display = 'none';
-                        }
-                }.bind(this), true);
-                //
-                this.radioLinear.addEventListener('change', function (e){
-                        this.mode = 'linear';
-                }.bind(this), true);
-                //
-                this.radioRadial.addEventListener('change', function (e){
-                        this.mode = 'radial';
-                }.bind(this), true);    
-                }
+        value: function() {
+            //Getting component views from layout
+            this._trackData.width = parseInt(getComputedStyle(this.trackChips).getPropertyCSSValue('width').cssText);
+            //TODO: Fix events and remove this hack
+            this.trackCover.addEventListener('mouseover', function () {
+                if (!this._updating) {
+                    this.trackCover.style.display = 'none';
+                }
+            }.bind(this), true);
+            //
+            this.radioLinear.addEventListener('change', function (e){
+                this.mode = 'linear';
+            }.bind(this), true);
+            //
+            this.radioRadial.addEventListener('change', function (e){
+                this.mode = 'radial';
+            }.bind(this), true);
+        }
     },
     ////////////////////////////////////////////////////////////////////
     //
     draw: {
-        value: function() {
-                //Checking for mode to assign radio value
-                if (this.mode === 'linear') {
-                        this.radioLinear.checked = 'true';
-                } else if (this.mode === 'radial') {
-                        this.radioRadial.checked = 'true';
-                }
-                //Checkign for value to initialize stops
-                if (!this.value) {
-                        this.addDefaultStops();
-                        } else {
-                                //Adding stops from preset value
-                                for (var i=0, stops = this.value; stops[i]; i++) {
-                                        this.addStop({color: {mode: stops[i].mode, value: stops[i].value}, percent:stops[i].position}, true);
-                                }
-                        }
-        }
+        value: function() {
+            //Checking for mode to assign radio value
+            if (this.mode === 'linear') {
+                this.radioLinear.checked = 'true';
+            } else if (this.mode === 'radial') {
+                this.radioRadial.checked = 'true';
+            }
+            //Checkign for value to initialize stops
+            if (!this.value) {
+                this.addDefaultStops();
+            } else {
+                //Adding stops from preset value
+                for (var i=0, stops = this.value; stops[i]; i++) {
+                    this.addStop({color: {mode: stops[i].mode, value: stops[i].value}, percent:stops[i].position}, true);
+                }
+            }
+        }
     },
     ////////////////////////////////////////////////////////////////////
     //
-        didDraw: {
-        value: function() {
-                        //Adding event listener for stops
-                        this.trackMain.addEventListener('click', this, false);
-                //Getting position of track
-                var point = webkitConvertPointFromNodeToPage(this.trackMain, new WebKitPoint(0, 0));
-                //Setting position of track to calculate movement
-                this._trackData.x = point.x;
-                this._trackData.y = point.y;    
-        }
+    didDraw: {
+        value: function() {
+            //Adding event listener for stops
+            this.trackMain.addEventListener('click', this, false);
+            //Getting position of track
+            var point = webkitConvertPointFromNodeToPage(this.trackMain, new WebKitPoint(0, 0));
+            //Setting position of track to calculate movement
+            this._trackData.x = point.x;
+            this._trackData.y = point.y;
+        }
     },
     ////////////////////////////////////////////////////////////////////
     //Default stops funtion (reset)
     addDefaultStops: {
-        value: function() {
-                this.addStop({color: {mode: 'rgb', value: {r: 255, g: 255, b: 255, a: 1, css: 'rgb(255, 255, 255)'}}, percent: 0}, true);
-                        this.addStop({color: {mode: 'rgb', value: {r: 0, g: 0, b: 0, a: 1, css: 'rgb(0, 0, 0)'}}, percent: 100}, true);
-        }
+        value: function() {
+            this.addStop({color: {mode: 'rgb', value: {r: 255, g: 255, b: 255, a: 1, css: 'rgb(255, 255, 255)'}}, percent: 0}, true);
+            this.addStop({color: {mode: 'rgb', value: {r: 0, g: 0, b: 0, a: 1, css: 'rgb(0, 0, 0)'}}, percent: 100}, true);
+        }
     },
     ////////////////////////////////////////////////////////////////////
     //
-        addStop: {
-        value: function(data, silent) {
-                if (this.application.ninja.colorController.colorPopupManager) {
-                        //Hiding any open popups (of gradient buttons)
-                        this.application.ninja.colorController.colorPopupManager.hideGradientChipPopup();
-                        //Creating stop elements
-                        var stop = document.createElement('div'),
-                                holder = document.createElement('div'),
+    addStop: {
+        value: function(data, silent) {
+            if (this.application.ninja.colorController.colorPopupManager) {
+                //Hiding any open popups (of gradient buttons)
+                this.application.ninja.colorController.colorPopupManager.hideGradientChipPopup();
+                //Creating stop elements
+                var stop = document.createElement('div'),
+                    holder = document.createElement('div'),