1 files changed, 77 insertions, 122 deletions

diff --git a/js/panels/color/colorpopup-manager.js b/js/panels/color/colorpopup-manager.js
index 15d55787..cf6fd7ac 100755
--- a/js/panels/color/colorpopup-manager.js
+++ b/js/panels/color/colorpopup-manager.js
@@ -20,52 +20,87 @@ exports.ColorPopupManager = Montage.create(Component, {
     },
     ////////////////////////////////////////////////////////////////////
     //
-    _hasInit: {
-        value: false
+    _hasCloseEvents: {
+                value: false  
     },
     ////////////////////////////////////////////////////////////////////
     //
-    init: {
+    addCloseEvents: {
         value: function () {
+                //
+                this._hasCloseEvents = true;
                 ////////////////////////////////////////////////////////////
             //Closing popups on resize
-            window.addEventListener('resize', function (e) {
-                this.application.ninja.colorController.colorPopupManager.hideColorPopup();
-            }.bind(this));
+            window.addEventListener('resize', this, false);
             //Closing popups if outside limits
-            document.addEventListener('mousedown', 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();
-                        }
-                }
-            }.bind(this));
+            document.addEventListener('mousedown', this, false);
             ////////////////////////////////////////////////////////////
         }
     },
     ////////////////////////////////////////////////////////////////////
     //
+    removeCloseEvents: {
+        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);
+                }  
+    },
+    ////////////////////////////////////////////////////////////////////
+    //
+    handleResize: {
+                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();
+                        }
+                }
+                }  
+    },
+    ////////////////////////////////////////////////////////////////////
+    //
     popupHitCheck: {
                 value: function (element, e) {
                         //Prevent any action for button to handle toggling
@@ -161,9 +196,8 @@ exports.ColorPopupManager = Montage.create(Component, {
                         this._colorPopupDrawing = true;
                         ////////////////////////////////////////////////////
                         //Initializing events
-                        if (!this._hasinit) {
-                                this.init();
-                                this._hasinit = true;
+                        if (!this._hasCloseEvents) {
+                                this.addCloseEvents();
                         }
                         ////////////////////////////////////////////////////
                         //Creating popup
@@ -191,6 +225,7 @@ exports.ColorPopupManager = Montage.create(Component, {
                         //
                         this._popupBase.popup.removeEventListener('didDraw', this, false);
                         //
+                        this.removeCloseEvents();
                         this.hideColorChipPopup();
                         this.hideGradientChipPopup();
                         //Making sure to return color manager to either stroke or fill (might be a Hack for now)
@@ -313,9 +348,8 @@ exports.ColorPopupManager = Montage.create(Component, {
                         this._colorChipPopupDrawing = true;
                         ////////////////////////////////////////////////////
                         //Initializing events
-                        if (!this._hasinit) {
-                                this.init();
-                                this._hasinit = true;
+                        if (!this._hasCloseEvents) {
+                                this.addCloseEvents();
                         }
                         ////////////////////////////////////////////////////
                         //Creating popup
@@ -358,6 +392,7 @@ exports.ColorPopupManager = Montage.create(Component, {
                 //
                 if (this._popupChipBase && this._popupChipBase.opened) {
                         //
+                        this.removeCloseEvents();
                         this.hideGradientChipPopup();
                         //
                         this._popupChipBase.popup.removeEventListener('didDraw', this, false);
@@ -392,9 +427,8 @@ exports.ColorPopupManager = Montage.create(Component, {
                         this._colorGradientPopupDrawing = true;
                         ////////////////////////////////////////////////////
                         //Initializing events
-                        if (!this._hasinit) {
-                                this.init();
-                                this._hasinit = true;
+                        if (!this._hasCloseEvents) {
+                                this.addCloseEvents();
                         }
                         ////////////////////////////////////////////////////
                         //Creating popup
@@ -519,85 +553,6 @@ exports.ColorPopupManager = Montage.create(Component, {
                                 }
                         }
                 }
-                
-                
-                
-                
-                
-                
-                
-                
-                
-                
-                
-                
-                
-                
-                
-                
-                
-                
-                
-                
-