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

diff --git a/js/components/prompt.reel/prompt.js b/js/components/prompt.reel/prompt.js
index 52f8e4e0..bb2c87dd 100644
--- a/js/components/prompt.reel/prompt.js
+++ b/js/components/prompt.reel/prompt.js
@@ -30,68 +30,68 @@ 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;
 ////////////////////////////////////////////////////////////////////////
-//      
+//
 exports.NinjaPrompt = Montage.create(Component, {
-        ////////////////////////////////////////////////////////////////////
-        //TODO: This should have an UI template eventually
-        hasTemplate: {
+    ////////////////////////////////////////////////////////////////////
+    //TODO: This should have an UI template eventually
+    hasTemplate: {
         value: false
     },
     ////////////////////////////////////////////////////////////////////
-        //Type of prompt window (should be confirm, prompt, alert, or input)
-        _type: {
-                value: null
-        },
-        ////////////////////////////////////////////////////////////////////
-        //
-        _params: {
-                value: null
-        },
-        ////////////////////////////////////////////////////////////////////
-        //
-        _callback: {
-                value: null
-        },
+    //Type of prompt window (should be confirm, prompt, alert, or input)
+    _type: {
+        value: null
+    },
+    ////////////////////////////////////////////////////////////////////
+    //
+    _params: {
+        value: null
+    },
+    ////////////////////////////////////////////////////////////////////
+    //
+    _callback: {
+        value: null
+    },
+    ////////////////////////////////////////////////////////////////////
+    //
+    initialize: {
+        value: function (type, params, callback) {
+            //
+            this._type = type.toLowerCase();
+            this._params = params;
+            this._callback = callback;
+        }
+    },
+    ////////////////////////////////////////////////////////////////////
+    //
+    show: {
+        value: function () {
+            //
+            var input;
+            //
+            switch (this._type) {
+                case 'confirm':
+                    input = confirm(this._params.message);
+                    if (this._callback) this._callback(input);
+                    break;
+                default:
+                    //TODO: Add support for other standard box types
+                    break;
+            }
+        }
+    },
+    ////////////////////////////////////////////////////////////////////
+    //This is for later, need to hide if need (overwrite)
+    hide: {
+        value: function () {
+            //TODO: Add support as real UI component
+        }
+    }
+    ////////////////////////////////////////////////////////////////////
     ////////////////////////////////////////////////////////////////////
-        //
-        initialize: {
-                value: function (type, params, callback) {
-                        //
-                        this._type = type.toLowerCase();
-                        this._params = params;
-                        this._callback = callback;
-                }
-        },
-        ////////////////////////////////////////////////////////////////////
-        //
-        show: {
-                value: function () {
-                        //
-                        var input;
-                        //
-                        switch (this._type) {
-                                case 'confirm':
-                                        input = confirm(this._params.message);
-                                        if (this._callback) this._callback(input);
-                                        break;
-                                default:
-                                        //TODO: Add support for other standard box types
-                                        break;
-                        }
-                }
-        },
-        ////////////////////////////////////////////////////////////////////
-        //This is for later, need to hide if need (overwrite)
-        hide: {
-                value: function () {
-                        //TODO: Add support as real UI component
-                }
-        }
-        ////////////////////////////////////////////////////////////////////
-        ////////////////////////////////////////////////////////////////////
 });
 ////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////