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

diff --git a/js/panels/color/colorpopup-manager.js b/js/panels/color/colorpopup-manager.js
index 7daf0e97..5667fbe7 100755
--- a/js/panels/color/colorpopup-manager.js
+++ b/js/panels/color/colorpopup-manager.js
@@ -27,156 +27,156 @@ 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,
-        ColorPanelPopup =       require("js/panels/Color/colorpanelpopup.reel").ColorPanelPopup,
-        ColorModel =        require("js/models/color-model").ColorModel;
+var Montage =           require("montage/core/core").Montage,
+    Component =         require("montage/ui/component").Component,
+    ColorPanelPopup =   require("js/panels/Color/colorpanelpopup.reel").ColorPanelPopup,
+    ColorModel =        require("js/models/color-model").ColorModel;
 ////////////////////////////////////////////////////////////////////////
 //Exporting as ColorPopupManager
 exports.ColorPopupManager = Montage.create(Component, {
     ////////////////////////////////////////////////////////////////////
     //
     hasTemplate: {
-        value: false
+        value: false
     },
     ////////////////////////////////////////////////////////////////////
     //
     _hasCloseEvents: {
-                value: false  
+        value: false
     },
     ////////////////////////////////////////////////////////////////////
     //
     addCloseEvents: {
-        value: function () {
-                //
-                this._hasCloseEvents = true;
-                ////////////////////////////////////////////////////////////
+        value: function () {
+            //
+            this._hasCloseEvents = true;
+            ////////////////////////////////////////////////////////////
             //Closing popups on resize
             window.addEventListener('resize', this, false);
             //Closing popups if outside limits
             document.addEventListener('mousedown', this, false);
             ////////////////////////////////////////////////////////////
-        }
+        }
     },
     ////////////////////////////////////////////////////////////////////
     //
     removeCloseEvents: {
-        value: function () {
-                //
-                this._hasCloseEvents = false;
-                ////////////////////////////////////////////////////////////
+        value: function () {
+            //
+            this._hasCloseEvents = false;
+            ////////////////////////////////////////////////////////////
             //Closing popups on resize
             window.removeEventListener('resize', this, false);
             //Closing popups if outside limits
             document.removeEventListener('mousedown', this, false);
             ////////////////////////////////////////////////////////////
-        }
+        }
     },
     ////////////////////////////////////////////////////////////////////
     //
     handleMousedown: {
-                value: function (e) {
-                        //
-                        this.closeAllPopups(e);
-                }  
+        value: function (e) {
+            //
+            this.closeAllPopups(e);
+        }
     },
     ////////////////////////////////////////////////////////////////////
     //
     handleResize: {
-                value: function (e) {
-                        //
-                        this.hideColorPopup();
-                }  
+        value: function (e) {
+            //
+            this.hideColorPopup();
+        }
     },
     ////////////////////////////////////////////////////////////////////
     //
     closeAllPopups: {
-                value: function (e) {
-                        //
-                if (this._popupBase && !this._popupChipBase && !this._popupGradientChipBase) {
-                        if(!this.popupHitCheck(this._popupBase, e)) {
-                        this.hideColorPopup();
-                        }
-                } else if (!this._popupBase && this._popupChipBase && !this._popupGradientChipBase) {
-                if(!this.popupHitCheck(this._popupChipBase, e)) {
-                        this.hideColorChipPopup();
-                        }
-                } else if (this._popupBase && this._popupChipBase && !this._popupGradientChipBase) {
-                if(!this.popupHitCheck(this._popupBase, e) && !this.popupHitCheck(this._popupChipBase, e)) {
-                        this.hideColorPopup();
-                        }
-                } else if (this._popupBase && this._popupChipBase && this._popupGradientChipBase) {
-                if(!this.popupHitCheck(this._popupBase, e) && !this.popupHitCheck(this._popupChipBase, e) && !this.popupHitCheck(this._popupGradientChipBase, e)) {
-                        this.hideColorPopup();
-                        }
-                } else if (!this._popupBase && this._popupChipBase && this._popupGradientChipBase) {
-                if(!this.popupHitCheck(this._popupChipBase, e) && !this.popupHitCheck(this._popupGradientChipBase, e)) {
-                        this.hideColorChipPopup();
-                        }
-                } else if (this._popupBase && !this._popupChipBase && this._popupGradientChipBase) {
-                if(!this.popupHitCheck(this._popupBase, e) && !this.popupHitCheck(this._popupGradientChipBase, e)) {
-                        this.hideColorPopup();
-                        }
-                }
-                }  
+        value: function (e) {
+            //
+            if (this._popupBase && !this._popupChipBase && !this._popupGradientChipBase) {
+                if(!this.popupHitCheck(this._popupBase, e)) {
+                    this.hideColorPopup();
+                }
+            } else if (!this._popupBase && this._popupChipBase && !this._popupGradientChipBase) {
+                if(!this.popupHitCheck(this._popupChipBase, e)) {
+                    this.hideColorChipPopup();
+                }
+            } else if (this._popupBase && this._popupChipBase && !this._popupGradientChipBase) {
+                if(!this.popupHitCheck(this._popupBase, e) && !this.popupHitCheck(this._popupChipBase, e)) {
+                    this.hideColorPopup();
+                }
+            } else if (this._popupBase && this._popupChipBase && this._popupGradientChipBase) {
+                if(!this.popupHitCheck(this._popupBase, e) && !this.popupHitCheck(this._popupChipBase, e) && !this.popupHitCheck(this._popupGradientChipBase, e)) {
+                    this.hideColorPopup();
+                }
+            } else if (!this._popupBase && this._popupChipBase && this._popupGradientChipBase) {
+                if(!this.popupHitCheck(this._popupChipBase, e) && !this.popupHitCheck(this._popupGradientChipBase, e)) {
+                    this.hideColorChipPopup();
+                }
+            } else if (this._popupBase && !this._popupChipBase && this._popupGradientChipBase) {
+                if(!this.popupHitCheck(this._popupBase, e) && !this.popupHitCheck(this._popupGradientChipBase, e)) {
+                    this.hideColorPopup();
+                }
+            }
+        }
     },
     ////////////////////////////////////////////////////////////////////
     //
     popupHitCheck: {
-                value: function (element, e) {
-                        //Prevent any action for button to handle toggling
-                        if (e._event.target.inputType || e._event.target.colorMode) return true;
-                        //Storing limits of popup 
-                        var top, bottom, left, right;
-                        //Checking for popup to be opened otherwise nothing happens
-                        if (element && element.opened && element.popup && element.popup.element) {
-                //Getting horizontal limits     
-                left = parseInt(element.popup.element.style.left) + parseInt(element.popup.element.style.marginLeft);
-                right = left + parseInt(element.popup.element.offsetWidth);
-                //Getting vertical limits
-                top = parseInt(element.popup.element.style.top) + parseInt(element.popup.element.style.marginTop);
-                bottom = top + parseInt(element.popup.element.offsetHeight);
-                //Checking click position in relation to limits
-                if ((e._event.clientX < left || e._event.clientX > right) || (e._event.clientY < top || e._event.clientY > bottom)) {
-                        //Hides popups since click is outside limits
-                        return false;
-                } else {
-                        //Keeps popup open since click inside area
-                        return true;
-                }
+        value: function (element, e) {
+            //Prevent any action for button to handle toggling
+            if (e._event.target.inputType || e._event.target.colorMode) return true;
+            //Storing limits of popup
+            var top, bottom, left, right;
+            //Checking for popup to be opened otherwise nothing happens
+            if (element && element.opened && element.popup && element.popup.element) {
+                //Getting horizontal limits
+                left = parseInt(element.popup.element.style.left) + parseInt(element.popup.element.style.marginLeft);
+                right = left + parseInt(element.popup.element.offsetWidth);
+                //Getting vertical limits
+                top = parseInt(element.popup.element.style.top) + parseInt(element.popup.element.style.marginTop);
+                bottom = top + parseInt(element.popup.element.offsetHeight);
+                //Checking click position in relation to limits
+                if ((e._event.clientX < left || e._event.clientX > right) || (e._event.clientY < top || e._event.clientY > bottom)) {
+                    //Hides popups since click is outside limits
+                    return false;
+                } else {
+                    //Keeps popup open since click inside area
+                    return true;
+                }
             } else {
-                //Hides popups since element not detected
-                    return false;
+                //Hides popups since element not detected
+                return false;
             }