github
/
element
mirror of https://github.com/ElemeFE/element
1
0
Fork 0
Code Issues Releases Wiki Activity

Popover: fix destroy the events, fixed #3555 (#3672)

pull/3720/head
cinwell.li 2017-03-24 15:31:21 +08:00 committed by baiyaaaaa
parent fd42bf1efc
commit 8359db6d25
1 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
packages/popover/src/main.vue
View File

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