From d5287baea99aca452a11f69a4fdf2eaf9df8c2b7 Mon Sep 17 00:00:00 2001 From: Marcos Moura Date: Thu, 8 Sep 2016 01:38:25 -0300 Subject: [PATCH] Create a better cleanup --- src/components/mdTooltip/mdTooltip.vue | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/components/mdTooltip/mdTooltip.vue b/src/components/mdTooltip/mdTooltip.vue index 086c941..5aec44b 100644 --- a/src/components/mdTooltip/mdTooltip.vue +++ b/src/components/mdTooltip/mdTooltip.vue @@ -113,13 +113,18 @@ targetElement.addEventListener('blur', onMouseLeave); }, beforeDestroy() { - document.body.removeChild(this.$el); this.active = false; - targetElement.removeEventListener('mouseenter', onMouseEnter); - targetElement.removeEventListener('focus', onMouseEnter); - targetElement.removeEventListener('mouseleave', onMouseLeave); - targetElement.removeEventListener('blur', onMouseLeave); + if (this.$el.parentNode) { + document.body.removeChild(this.$el); + } + + if (targetElement) { + targetElement.removeEventListener('mouseenter', onMouseEnter); + targetElement.removeEventListener('focus', onMouseEnter); + targetElement.removeEventListener('mouseleave', onMouseLeave); + targetElement.removeEventListener('blur', onMouseLeave); + } } };