use element __vue__ as transition context if present

yyx990803 · yyx990803 · commit 67eb247703f9 · 2015-04-04T22:06:51.000-04:00
diff --git a/src/transition/js.js b/src/transition/js.js
@@ -11,6 +11,9 @@
  */
 
 module.exports = function (el, direction, op, data, def, vm, cb) {
+  // if the element is the root of an instance,
+  // use that instance as the transition function context
+  vm = el.__vue__ || vm
   if (data.cancel) {
     data.cancel()
     data.cancel = null
diff --git a/test/unit/specs/transition/transition_spec.js b/test/unit/specs/transition/transition_spec.js
@@ -340,6 +340,20 @@ if (_.inBrowser && !_.isIE9) {
         expect(spy).toHaveBeenCalledWith(vm)
       })
 
+      it('this context set to el instance', function () {
+        var spy = jasmine.createSpy('js enter this')
+        var vm2 = el.__vue__ = {}
+        def.enter = function (e, done) {
+          expect(e).toBe(el)
+          expect(op).toHaveBeenCalled()
+          done()
+          expect(cb).toHaveBeenCalled()
+          spy(this)
+        }
+        transition.apply(el, 1, op, vm, cb)
+        expect(spy).toHaveBeenCalledWith(vm2)
+      })
+
       it('leave', function () {
         var spy = jasmine.createSpy('js leave')
         def.leave = function (e, done) {
