ensure transition end detection only count events triggered on target element (fix #3506)

yyx990803 · yyx990803 · commit 98876f008b4e · 2016-08-27T17:14:25.000-04:00
diff --git a/src/platforms/web/runtime/transition-util.js b/src/platforms/web/runtime/transition-util.js
@@ -60,9 +60,11 @@ export function whenTransitionEnds (
     el.removeEventListener(event, onEnd)
     cb()
   }
-  const onEnd = () => {
-    if (++ended >= propCount) {
-      end()
+  const onEnd = e => {
+    if (e.target === el) {
+      if (++ended >= propCount) {
+        end()
+      }
     }
   }
   setTimeout(() => {

Original file line number	Diff line number	Diff line change
`@@ -60,9 +60,11 @@ export function whenTransitionEnds (`
`60`	`60`	`el.removeEventListener(event, onEnd)`
`61`	`61`	`cb()`
`62`	`62`	`}`
`63`		`- const onEnd = () => {`
`64`		`- if (++ended >= propCount) {`
`65`		`- end()`
	`63`	`+ const onEnd = e => {`
	`64`	`+ if (e.target === el) {`
	`65`	`+ if (++ended >= propCount) {`
	`66`	`+ end()`
	`67`	`+ }`
`66`	`68`	`}`
`67`	`69`	`}`
`68`	`70`	`setTimeout(() => {`