support string values for transition duration

yyx990803 · yyx990803 · commit 10e724fa78b5 · 2017-02-25T18:58:15.000-05:00
diff --git a/src/platforms/web/runtime/components/transition.js b/src/platforms/web/runtime/components/transition.js
@@ -22,7 +22,7 @@ export const transitionProps = {
   appearClass: String,
   appearActiveClass: String,
   appearToClass: String,
-  duration: [Number, Object]
+  duration: [Number, String, Object]
 }
 
 // in case the child is also an abstract component, e.g. <keep-alive>
diff --git a/src/platforms/web/runtime/modules/transition.js b/src/platforms/web/runtime/modules/transition.js
@@ -1,6 +1,6 @@
 /* @flow */
 
-import { once, isObject } from 'shared/util'
+import { once, isObject, toNumber } from 'shared/util'
 import { inBrowser, isIE9, warn } from 'core/util/index'
 import { mergeVNodeHook } from 'core/vdom/helpers/index'
 import { activeInstance } from 'core/instance/lifecycle'
@@ -77,7 +77,7 @@ export function enter (vnode: VNodeWithData, toggleDisplay: ?() => void) {
   const afterEnterHook = isAppear ? (afterAppear || afterEnter) : afterEnter
   const enterCancelledHook = isAppear ? (appearCancelled || enterCancelled) : enterCancelled
 
-  const explicitEnterDuration = isObject(duration) ? duration.enter : duration
+  const explicitEnterDuration = toNumber(isObject(duration) ? duration.enter : duration)
   if (process.env.NODE_ENV !== 'production' && explicitEnterDuration != null) {
     checkDuration(explicitEnterDuration, 'enter', vnode)
   }
@@ -179,7 +179,7 @@ export function leave (vnode: VNodeWithData, rm: Function) {
   const expectsCSS = css !== false && !isIE9
   const userWantsControl = getHookAgumentsLength(leave)
 
-  const explicitLeaveDuration = isObject(duration) ? duration.leave : duration
+  const explicitLeaveDuration = toNumber(isObject(duration) ? duration.leave : duration)
   if (process.env.NODE_ENV !== 'production' && explicitLeaveDuration != null) {
     checkDuration(explicitLeaveDuration, 'leave', vnode)
   }
diff --git a/test/unit/features/transition/transition.spec.js b/test/unit/features/transition/transition.spec.js
@@ -882,7 +882,7 @@ if (!isIE9) {
         const vm = new Vue({
           template: `
             <div>
-              <transition :duration="${explicitDuration}">
+              <transition duration="${explicitDuration}">
                 <div v-if="ok" class="test">foo</div>
               </transition>
             </div>

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ export const transitionProps = {`
`22`	`22`	`appearClass: String,`
`23`	`23`	`appearActiveClass: String,`
`24`	`24`	`appearToClass: String,`
`25`		`- duration: [Number, Object]`
	`25`	`+ duration: [Number, String, Object]`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`// in case the child is also an abstract component, e.g. <keep-alive>`