From 80fe4ce1f3ac7ac6314ed6f2ed5c1c19e4a53827 Mon Sep 17 00:00:00 2001
From: "qingwei.li" <cinwell.li@gmail.com>
Date: Tue, 13 Sep 2016 21:56:20 +0800
Subject: [PATCH] Tooltip: fix appear in the wrong place

---
 CHANGELOG.md                  |  1 +
 package.json                  |  5 ++---
 packages/popover/src/main.vue |  2 +-
 packages/tooltip/src/main.vue |  2 +-
 src/utils/vue-popper.js       | 11 ++---------
 5 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 321bf0848..4caaad0a1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 
 - 修复 Select 多选时选项变为空数组后 placeholder 不出现的问题
 - 修复 TimePicker 时间选择可滚动
+- 修复 Tooltip 会有出现错位的情况
 
 #### 非兼容性更新
 - Select 组件样式的 `display` 属性默认值修改为 `block`
diff --git a/package.json b/package.json
index d4d524a5d..c9544be53 100644
--- a/package.json
+++ b/package.json
@@ -68,12 +68,11 @@
     "theaterjs": "^3.0.0",
     "uppercamelcase": "^1.1.0",
     "url-loader": "^0.5.7",
-    "vue": "2.0.0-rc.3",
-    "vue-loader": "9.3.2",
+    "vue": "^2.0.0-rc.6",
+    "vue-loader": "^9.4.2",
     "vue-markdown-loader": "^0.4.0",
     "vue-popup": "^0.2.3",
     "vue-router": "^2.0.0-beta.2",
-    "vue-template-compiler": "2.0.0-rc.3",
     "webpack": "^1.13.2",
     "webpack-dev-server": "^1.15.1",
     "wind-dom": "0.0.3"
diff --git a/packages/popover/src/main.vue b/packages/popover/src/main.vue
index e5e777caa..2f840df83 100644
--- a/packages/popover/src/main.vue
+++ b/packages/popover/src/main.vue
@@ -1,6 +1,6 @@
 <template>
   <span>
-    <transition :name="transition">
+    <transition :name="transition" @after-leave="doDestroy">
       <div
         class="el-popover"
         ref="popper"
diff --git a/packages/tooltip/src/main.vue b/packages/tooltip/src/main.vue
index e313fcafd..8de13e129 100644
--- a/packages/tooltip/src/main.vue
+++ b/packages/tooltip/src/main.vue
@@ -7,7 +7,7 @@
       <slot></slot>
     </div>
 
-    <transition :name="transition">
+    <transition :name="transition" @after-leave="doDestroy">
       <div
         class="el-tooltip__popper"
         :class="['is-' + effect]"
diff --git a/src/utils/vue-popper.js b/src/utils/vue-popper.js
index f35192ad4..5cb62c770 100644
--- a/src/utils/vue-popper.js
+++ b/src/utils/vue-popper.js
@@ -1,5 +1,5 @@
 import PopperJS from 'main/utils/popper';
-import { once } from 'wind-dom/src/event';
+
 /**
  * @param {HTMLElement} [reference=$refs.reference] - The reference element used to position the popper.
  * @param {HTMLElement} [popper=$refs.popper] - The HTML element used as popper, or a configuration used to generate the popper.
@@ -100,20 +100,13 @@ export default {
 
     doDestroy() {
       if (this.showPopper) return;
-      this.popperJS && this.popperJS.destroy();
+      this.popperJS.destroy();
       this.popperJS = null;
     },
 
     destroyPopper() {
       if (this.popperJS) {
         this.resetTransformOrigin(this.popperJS);
-        if (this.transition) {
-          once(this.popperJS._popper, 'webkitTransitionEnd', this.doDestroy);
-          once(this.popperJS._popper, 'oTransitionend', this.doDestroy);
-          once(this.popperJS._popper, 'transitionend', this.doDestroy);
-        } else {
-          this.doDestroy();
-        }
       }
     },