@@ -149,13 +149,15 @@ export function enter (vnode: VNodeWithData, toggleDisplay: ?() => void) {
149
149
addTransitionClass ( el , startClass )
150
150
addTransitionClass ( el , activeClass )
151
151
nextFrame ( ( ) => {
152
- addTransitionClass ( el , toClass )
153
152
removeTransitionClass ( el , startClass )
154
- if ( ! cb . cancelled && ! userWantsControl ) {
155
- if ( isValidDuration ( explicitEnterDuration ) ) {
156
- setTimeout ( cb , explicitEnterDuration )
157
- } else {
158
- whenTransitionEnds ( el , type , cb )
153
+ if ( ! cb . cancelled ) {
154
+ addTransitionClass ( el , toClass )
155
+ if ( ! userWantsControl ) {
156
+ if ( isValidDuration ( explicitEnterDuration ) ) {
157
+ setTimeout ( cb , explicitEnterDuration )
158
+ } else {
159
+ whenTransitionEnds ( el , type , cb )
160
+ }
159
161
}
160
162
}
161
163
} )
@@ -257,13 +259,15 @@ export function leave (vnode: VNodeWithData, rm: Function) {
257
259
addTransitionClass ( el , leaveClass )
258
260
addTransitionClass ( el , leaveActiveClass )
259
261
nextFrame ( ( ) => {
260
- addTransitionClass ( el , leaveToClass )
261
262
removeTransitionClass ( el , leaveClass )
262
- if ( ! cb . cancelled && ! userWantsControl ) {
263
- if ( isValidDuration ( explicitLeaveDuration ) ) {
264
- setTimeout ( cb , explicitLeaveDuration )
265
- } else {
266
- whenTransitionEnds ( el , type , cb )
263
+ if ( ! cb . cancelled ) {
264
+ addTransitionClass ( el , leaveToClass )
265
+ if ( ! userWantsControl ) {
266
+ if ( isValidDuration ( explicitLeaveDuration ) ) {
267
+ setTimeout ( cb , explicitLeaveDuration )
268
+ } else {
269
+ whenTransitionEnds ( el , type , cb )
270
+ }
267
271
}
268
272
}
269
273
} )
0 commit comments