From: Evan You <yyx990803@gmail.com>
Date: Mon, 23 Mar 2020 15:13:37 +0000 (-0400)
Subject: fix(transition): fix duration prop validation
X-Git-Tag: v3.0.0-alpha.10~21
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0dc24785699101fa24d2a68786feaaac8a887520;p=thirdparty%2Fvuejs%2Fcore.git

fix(transition): fix duration prop validation

fix #868
---

diff --git a/packages/runtime-dom/src/components/Transition.ts b/packages/runtime-dom/src/components/Transition.ts
index f82b4e9cda..d80d4f9ee4 100644
--- a/packages/runtime-dom/src/components/Transition.ts
+++ b/packages/runtime-dom/src/components/Transition.ts
@@ -45,7 +45,7 @@ export const TransitionPropsValidators = {
     type: Boolean,
     default: true
   },
-  duration: Object,
+  duration: [String, Number, Object],
   enterFromClass: String,
   enterActiveClass: String,
   enterToClass: String,