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

diff --git a/js/components/popup-manager.reel/popup-manager.js b/js/components/popup-manager.reel/popup-manager.js
index 07a07806..a32642b4 100755
--- a/js/components/popup-manager.reel/popup-manager.js
+++ b/js/components/popup-manager.reel/popup-manager.js
@@ -30,144 +30,144 @@ POSSIBILITY OF SUCH DAMAGE.
 
 ////////////////////////////////////////////////////////////////////////
 //
-var Montage =                   require("montage/core/core").Montage,
-        Component =             require("montage/ui/component").Component,
-        Popup =                         require("js/components/popup.reel").Popup;
+var Montage =           require("montage/core/core").Montage,
+    Component =         require("montage/ui/component").Component,
+    Popup =             require("js/components/popup.reel").Popup;
 ////////////////////////////////////////////////////////////////////////
 //Exporting as PopupManager
 exports.PopupManager = Montage.create(Component, {
-        ////////////////////////////////////////////////////////////////////
-        //
+    ////////////////////////////////////////////////////////////////////
+    //
     deserializedFromTemplate: {
-        value: function () {
-                //Setting styles to popup container
-                this.element.style.zIndex = this._getNextHighestZindex(document.body); // Highest z-index in body
-                this.element.style.position = 'absolute';
-                this.element.style.top = 0;
-                this.element.style.left = 0;
-                this.element.style.width = '100%';
-                this.element.style.height = '100%';
-                //Allowing mouse events to pass through this layer
-                this.element.style.pointerEvents = 'none';
-        }
+        value: function () {
+            //Setting styles to popup container
+            this.element.style.zIndex = this._getNextHighestZindex(document.body); // Highest z-index in body
+            this.element.style.position = 'absolute';
+            this.element.style.top = 0;
+            this.element.style.left = 0;
+            this.element.style.width = '100%';
+            this.element.style.height = '100%';
+            //Allowing mouse events to pass through this layer
+            this.element.style.pointerEvents = 'none';
+        }
     },
     ////////////////////////////////////////////////////////////////////
     //Adding the popup object
     addPopup: {
-        enumerable: true,
-        value: function (popup, depth, blackout) {
-                //Fix to ensure always highest
-                this.element.style.zIndex = this._getNextHighestZindex(document.body); // Highest z-index in body
-                //TODO: Add blackout background
-                //Checking for manual or setting auto to next highest depth
-                if (depth) {
-                        popup.style.zIndex = depth;
-                } else {
-                        popup.style.zIndex = this._getNextHighestZindex(this.element);
-                }
-                //Adding pointer events (inherits none)
-                popup.style.pointerEvents = 'auto';
+        enumerable: true,
+        value: function (popup, depth, blackout) {
+            //Fix to ensure always highest
+            this.element.style.zIndex = this._getNextHighestZindex(document.body); // Highest z-index in body
+            //TODO: Add blackout background
+            //Checking for manual or setting auto to next highest depth
+            if (depth) {
+                popup.style.zIndex = depth;
+            } else {
+                popup.style.zIndex = this._getNextHighestZindex(this.element);
+            }
+            //Adding pointer events (inherits none)
+            popup.style.pointerEvents = 'auto';
             this.element.appendChild(popup);
-                //TODO: Test further (perhaps defined in CSS)
-                popup.style.opacity = 0;
-                popup.style.webkitTransitionProperty = 'opacity';
-                popup.style.webkitTransitionDuration = '150ms';
-                //TODO: Fix animation hack
-                if (popup.style.webkitTransitionDuration) {
-                        setTimeout(function () {popup.style.opacity = 1}.bind(this), parseInt(popup.style.webkitTransitionDuration));
-                } else {
-                        popup.style.opacity = 1;
-                }
-        }
+            //TODO: Test further (perhaps defined in CSS)
+            popup.style.opacity = 0;
+            popup.style.webkitTransitionProperty = 'opacity';
+            popup.style.webkitTransitionDuration = '150ms';
+            //TODO: Fix animation hack
+            if (popup.style.webkitTransitionDuration) {
+                setTimeout(function () {popup.style.opacity = 1}.bind(this), parseInt(popup.style.webkitTransitionDuration));
+            } else {
+                popup.style.opacity = 1;
+            }
+        }
     },
     ////////////////////////////////////////////////////////////////////
     //Removing the popup object
     removePopup: {
-        enumerable: true,
-        value: function (popup) {
-                popup.style.opacity = 0;
-                //TODO: Fix animation hack
-                if (popup.style && popup.style.webkitTransitionDuration) {
-                        setTimeout(function () {this.element.removeChild(popup)}.bind(this), parseInt(popup.style.webkitTransitionDuration));
-                } else {
-                        this.element.removeChild(popup);
-                }
-        }
+        enumerable: true,
+        value: function (popup) {
+            popup.style.opacity = 0;
+            //TODO: Fix animation hack
+            if (popup.style && popup.style.webkitTransitionDuration) {
+                setTimeout(function () {this.element.removeChild(popup)}.bind(this), parseInt(popup.style.webkitTransitionDuration));
+            } else {
+                this.element.removeChild(popup);
+            }
+        }
     },
     ////////////////////////////////////////////////////////////////////
     //Swapping first with second object
     swapPopup: {
-        enumerable: true,
-        value: function (first, second) {
-                var f = first.style.zIndex, s = second.style.zIndex;
-                //Setting after storing values
-                first.style.zIndex = s;
-                second.style.zIndex = f;
-        }
+        enumerable: true,
+        value: function (first, second) {
+            var f = first.style.zIndex, s = second.style.zIndex;
+            //Setting after storing values
+            first.style.zIndex = s;
+            second.style.zIndex = f;
+        }
     },
     ////////////////////////////////////////////////////////////////////
     //Setting Popup to highest z-index
     bringToFrontPopup: {
-        enumerable: true,
-        value: function (popup) {
-                popup.style.zIndex = this._getNextHighestZindex(this.element);
-        }
+        enumerable: true,
+        value: function (popup) {
+            popup.style.zIndex = this._getNextHighestZindex(this.element);
+        }
     },
     ////////////////////////////////////////////////////////////////////
     //
     createPopup: {
-        enumerable: true,
-        value: function (content, position, tooltip) {
-                //Creating container for Popup
-                var container = document.createElement('div');
-                var pop = Popup.create();
-                //Setting container and content
-                pop.element = container;
-                pop.content = content;
-                //Checking for optional parameters
-                if (position)
-                        pop.position = position;
-                if (tooltip)
-                        pop.tooltip = tooltip;
-                //Adding Popup to view
-                this.addPopup(container);
-                pop.needsDraw = true;
-                //Returns pop component
-                return pop;
-        }
+        enumerable: true,
+        value: function (content, position, tooltip) {
+            //Creating container for Popup
+            var container = document.createElement('div');
+            var pop = Popup.create();
+            //Setting container and content
+            pop.element = container;
+            pop.content = content;
+            //Checking for optional parameters
+            if (position)
+                pop.position = position;
+            if (tooltip)
+                pop.tooltip = tooltip;
+            //Adding Popup to view
+            this.addPopup(container);
+            pop.needsDraw = true;
+            //Returns pop component
+            return pop;
+        }
     },
     ////////////////////////////////////////////////////////////////////
     //Accepts parent to scan for z-index and returns highest children
     _getNextHighestZindex: {
-        numerable: false,
-        value: function (parent) {
-                //CSS specificity in javascript found at http://gbradley.com/2009/10/02/css-specificity-in-javascript used with permission from Graham Bradley
-                        var high = 0, current = 0, children = [], i;
-                        //
-                        if (parent) {
-                                children = parent.getElementsByTagName('*');
-                        } else {
-                                children = document.getElementsByTagName('*');
+        numerable: false,
+        value: function (parent) {
+            //CSS specificity in javascript found at http://gbradley.com/2009/10/02/css-specificity-in-javascript used with permission from Graham Bradley
+            var high = 0, current = 0, children = [], i;
+            //
+            if (parent) {
+                children = parent.getElementsByTagName('*');
+            } else {
+                children = document.getElementsByTagName(