Skip to content

Commit 270e468

Browse files
committed
ensure moveCb only gets called on transform complete
1 parent a4d63a1 commit 270e468

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

Diff for: src/platforms/web/runtime/components/transition-group.js

+7-4
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ export default {
9494
}
9595

9696
children.forEach(c => {
97+
/* istanbul ignore if */
9798
if (c.elm._moveCb) {
9899
c.elm._moveCb()
99100
}
@@ -119,10 +120,12 @@ export default {
119120
addTransitionClass(el, moveClass)
120121
s.transform = s.WebkitTransform = s.transitionDuration = ''
121122
el._moveDest = c.data.pos
122-
el.addEventListener(transitionEndEvent, el._moveCb = function cb () {
123-
el.removeEventListener(transitionEndEvent, cb)
124-
el._moveCb = null
125-
removeTransitionClass(el, moveClass)
123+
el.addEventListener(transitionEndEvent, el._moveCb = function cb (e) {
124+
if (!e || /transform$/.test(e.propertyName)) {
125+
el.removeEventListener(transitionEndEvent, cb)
126+
el._moveCb = null
127+
removeTransitionClass(el, moveClass)
128+
}
126129
})
127130
}
128131
})

0 commit comments

Comments
 (0)