diff --git a/src/platforms/web/runtime/transition-util.js b/src/platforms/web/runtime/transition-util.js index 47668f0c37d..706210141fc 100644 --- a/src/platforms/web/runtime/transition-util.js +++ b/src/platforms/web/runtime/transition-util.js @@ -122,11 +122,12 @@ export function getTransitionInfo (el: Element, expectedType?: ?string): { hasTransform: boolean; } { const styles: any = window.getComputedStyle(el) - const transitionDelays: Array = styles[transitionProp + 'Delay'].split(', ') - const transitionDurations: Array = styles[transitionProp + 'Duration'].split(', ') + // JSDOM may return undefined for transition properties + const transitionDelays: Array = (styles[transitionProp + 'Delay'] || '').split(', ') + const transitionDurations: Array = (styles[transitionProp + 'Duration'] || '').split(', ') const transitionTimeout: number = getTimeout(transitionDelays, transitionDurations) - const animationDelays: Array = styles[animationProp + 'Delay'].split(', ') - const animationDurations: Array = styles[animationProp + 'Duration'].split(', ') + const animationDelays: Array = (styles[animationProp + 'Delay'] || '').split(', ') + const animationDurations: Array = (styles[animationProp + 'Duration'] || '').split(', ') const animationTimeout: number = getTimeout(animationDelays, animationDurations) let type: ?string