resolve js transition effect during compilation rather than at transition

yyx990803 · yyx990803 · commit 8a37764587be · 2014-12-10T12:11:18.000-05:00
diff --git a/src/directives/transition.js b/src/directives/transition.js
@@ -5,7 +5,9 @@ module.exports = {
 
   bind: function () {
     this.el.__v_trans = {
-      id: this.expression
+      id: this.expression,
+      // resolve the custom transition functions now
+      fns: this.vm.$options.transitions[this.expression]
     }
   }
 
diff --git a/src/transition/index.js b/src/transition/index.js
@@ -122,7 +122,7 @@ var apply = exports.apply = function (el, direction, op, vm, cb) {
     return
   }
   // determine the transition type on the element
-  var jsTransition = vm.$options.transitions[transData.id]
+  var jsTransition = transData.fns
   if (jsTransition) {
     // js
     applyJSTransition(
diff --git a/test/unit/specs/directives/transition_spec.js b/test/unit/specs/directives/transition_spec.js
@@ -4,14 +4,23 @@ var def = require('../../../../src/directives/transition')
 if (_.inBrowser) {
   describe('v-transition', function () {
 
-    it('should save the transition id as data', function () {
+    it('should save the transition id and custom functions as data', function () {
+      var fns = {}
       var dir = {
         el: document.createElement('div'),
         expression: 'test',
-        bind: def.bind
+        bind: def.bind,
+        vm: {
+          $options: {
+            transitions: {
+              test: fns
+            }
+          }
+        }
       }
       dir.bind()
       expect(dir.el.__v_trans.id).toBe('test')
+      expect(dir.el.__v_trans.fns).toBe(fns)
     })
 
   })
diff --git a/test/unit/specs/transition/transition_spec.js b/test/unit/specs/transition/transition_spec.js
@@ -305,18 +305,13 @@ if (_.inBrowser && !_.isIE9) {
       var el, vm, op, cb, def, emitter
       beforeEach(function () {
         emitter = {}
+        def = {}
         el = document.createElement('div')
-        el.__v_trans = { id: 'test' }
+        el.__v_trans = { id: 'test', fns: def }
         document.body.appendChild(el)
         op = jasmine.createSpy('js transition op')
         cb = jasmine.createSpy('js transition cb')
-        def = {}
-        vm = new Vue({
-          el: el,
-          transitions: {
-            test: def
-          }
-        })
+        vm = new Vue({ el: el })
       })
 
       afterEach(function () {

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,9 @@ module.exports = {`
`5`	`5`
`6`	`6`	`bind: function () {`
`7`	`7`	`this.el.__v_trans = {`
`8`		`- id: this.expression`
	`8`	`+ id: this.expression,`
	`9`	`+ // resolve the custom transition functions now`
	`10`	`+ fns: this.vm.$options.transitions[this.expression]`
`9`	`11`	`}`
`10`	`12`	`}`
`11`	`13`
Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ var apply = exports.apply = function (el, direction, op, vm, cb) {`
`122`	`122`	`return`
`123`	`123`	`}`
`124`	`124`	`// determine the transition type on the element`
`125`		`- var jsTransition = vm.$options.transitions[transData.id]`
	`125`	`+ var jsTransition = transData.fns`
`126`	`126`	`if (jsTransition) {`
`127`	`127`	`// js`
`128`	`128`	`applyJSTransition(`