test/vue
1
0
Fork 0
mirror of https://gitee.com/vuejs/vue.git synced 2024-12-02 12:07:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix enterActiveClass apply timing

Browse Source
This commit is contained in:
Evan You 2016-04-20 00:12:33 -04:00
parent 873c24cc64
commit 49ab77cb97
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/runtime/dom-backend/modules/transition.js
View File

@ -61,7 +61,6 @@ function beforeEnter (_, vnode) {
}
beforeEnter && beforeEnter(el)
// apply enter classes
if (enterClass) {
addTransitionClass(el, enterClass)
nextFrame(() => {
@ -69,16 +68,17 @@ function beforeEnter (_, vnode) {
})
}
if (enterActiveClass) {
addTransitionClass(el, enterActiveClass)
if (!userWantsControl) {
nextFrame(() => {
nextFrame(() => {
addTransitionClass(el, enterActiveClass)
if (!userWantsControl) {
whenTransitionEnds(el, cb)
})
}
} else if (!userWantsControl) {
cb()
}
})
}
enter && enter(el, cb)
if (!enterActiveClass && !userWantsControl) {
cb()
}
}
}
@ -120,10 +120,11 @@ function onLeave (vnode, rm) {
whenTransitionEnds(el, cb)
}
})
} else if (!userWantsControl) {
cb()
}
leave && leave(el, cb)
if (!leaveActiveClass && !userWantsControl) {
cb()
}
} else {
rm()
}