handle synchronous transition leave callback (fix vuejs#1117)

yyx990803 · yyx990803 · commit af08256211cb · 2015-08-04T19:14:49.000-04:00
diff --git a/src/transition/transition.js b/src/transition/transition.js
@@ -148,9 +148,11 @@ p.leave = function (op, cb) {
   addClass(this.el, this.leaveClass)
   this.callHookWithCb('leave')
   this.cancel = this.hooks && this.hooks.leaveCancelled
-  // only need to handle leaveDone if there's no explicit
-  // js callback
-  if (!this.pendingJsCb) {
+  // only need to handle leaveDone if
+  // 1. the transition is already done (synchronously called
+  //    by the user, which causes this.op set to null)
+  // 2. there's no explicit js callback
+  if (this.op && !this.pendingJsCb) {
     // if a CSS transition leaves immediately after enter,
     // the transitionend event never fires. therefore we
     // detect such cases and end the leave immediately.
@@ -188,6 +190,7 @@ p.leaveDone = function () {
   removeClass(this.el, this.leaveClass)
   this.callHook('afterLeave')
   if (this.cb) this.cb()
+  this.op = null
 }
 
 /**
diff --git a/test/unit/specs/transition/transition_spec.js b/test/unit/specs/transition/transition_spec.js
@@ -116,7 +116,7 @@ if (_.inBrowser && !_.isIE9) {
         expect(cb).toHaveBeenCalled()
       })
 
-      it('skip when no css transition is available', function () {
+      it('skip when css transition is not supported', function () {
         var e = _.transitionEndEvent
         _.transitionEndEvent = null
         el.__v_trans = new Transition(el, 'test', null, vm)
@@ -190,15 +190,18 @@ if (_.inBrowser && !_.isIE9) {
           expect(cb).toHaveBeenCalled()
           expect(hooks.afterEnter).toHaveBeenCalled()
           expect(el.classList.contains('test-no-trans-enter')).toBe(false)
-          transition.apply(el, -1, op, vm, cb)
-          expect(hooks.beforeLeave).toHaveBeenCalled()
-          expect(hooks.leave).toHaveBeenCalled()
+          // wait until transition.justEntered flag is off
           _.nextTick(function () {
-            expect(op.calls.count()).toBe(2)
-            expect(cb.calls.count()).toBe(2)
-            expect(hooks.afterLeave).toHaveBeenCalled()
-            expect(el.classList.contains('test-no-trans-leave')).toBe(false)
-            done()
+            transition.apply(el, -1, op, vm, cb)
+            expect(hooks.beforeLeave).toHaveBeenCalled()
+            expect(hooks.leave).toHaveBeenCalled()
+            _.nextTick(function () {
+              expect(op.calls.count()).toBe(2)
+              expect(cb.calls.count()).toBe(2)
+              expect(hooks.afterLeave).toHaveBeenCalled()
+              expect(el.classList.contains('test-no-trans-leave')).toBe(false)
+              done()
+            })
           })
         })
       })
