From 8359db6d259cdce35bd7e42e0a45ea5d7481f2a8 Mon Sep 17 00:00:00 2001
From: "cinwell.li" <cinwell.li@gmail.com>
Date: Fri, 24 Mar 2017 15:31:21 +0800
Subject: [PATCH] Popover: fix destroy the events, fixed #3555 (#3672)

---
 packages/popover/src/main.vue | 36 ++++++++++++++++++++++-------------
 1 file changed, 23 insertions(+), 13 deletions(-)

diff --git a/packages/popover/src/main.vue b/packages/popover/src/main.vue
index 7f944f8b7..a3a5435b0 100644
--- a/packages/popover/src/main.vue
+++ b/packages/popover/src/main.vue
@@ -59,7 +59,7 @@ export default {
       reference = this.referenceElm = this.$slots.reference[0].elm;
     }
     if (this.trigger === 'click') {
-      on(reference, 'click', () => { this.showPopper = !this.showPopper; });
+      on(reference, 'click', this.doToggle);
       on(document, 'click', this.handleDocumentClick);
     } else if (this.trigger === 'hover') {
       on(reference, 'mouseenter', this.handleMouseEnter);
@@ -75,8 +75,8 @@ export default {
         for (let i = 0; i < len; i++) {
           if (children[i].nodeName === 'INPUT' ||
               children[i].nodeName === 'TEXTAREA') {
-            on(children[i], 'focus', () => { this.showPopper = true; });
-            on(children[i], 'blur', () => { this.showPopper = false; });
+            on(children[i], 'focus', this.doShow);
+            on(children[i], 'blur', this.doClose);
             found = true;
             break;
           }
@@ -85,16 +85,25 @@ export default {
       if (found) return;
       if (reference.nodeName === 'INPUT' ||
         reference.nodeName === 'TEXTAREA') {
-        on(reference, 'focus', () => { this.showPopper = true; });
-        on(reference, 'blur', () => { this.showPopper = false; });
+        on(reference, 'focus', this.doShow);
+        on(reference, 'blur', this.doClose);
       } else {
-        on(reference, 'mousedown', () => { this.showPopper = true; });
-        on(reference, 'mouseup', () => { this.showPopper = false; });
+        on(reference, 'mousedown', this.doShow);
+        on(reference, 'mouseup', this.doClose);
       }
     }
   },
 
   methods: {
+    doToggle() {
+      this.showPopper = !this.showPopper;
+    },
+    doShow() {
+      this.showPopper = true;
+    },
+    doClose() {
+      this.showPopper = false;
+    },
     handleMouseEnter() {
       this.showPopper = true;
       clearTimeout(this._timer);
@@ -124,12 +133,13 @@ export default {
   destroyed() {
     const reference = this.reference;
 
-    off(reference, 'mouseup');
-    off(reference, 'mousedown');
-    off(reference, 'focus');
-    off(reference, 'blur');
-    off(reference, 'mouseleave');
-    off(reference, 'mouseenter');
+    off(reference, 'click', this.doToggle);
+    off(reference, 'mouseup', this.doClose);
+    off(reference, 'mousedown', this.doShow);
+    off(reference, 'focus', this.doShow);
+    off(reference, 'blur', this.doClose);
+    off(reference, 'mouseleave', this.handleMouseLeave);
+    off(reference, 'mouseenter', this.handleMouseEnter);
     off(document, 'click', this.handleDocumentClick);
   }
 };