From 0d9562754be89fa73fda667c9b936d19f36be0b4 Mon Sep 17 00:00:00 2001 From: Alex Ivasyuv Date: Wed, 30 May 2018 23:00:06 +0300 Subject: [PATCH 1/2] fixed #7444 --- src/platforms/web/runtime/transition-util.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/platforms/web/runtime/transition-util.js b/src/platforms/web/runtime/transition-util.js index 47668f0c37d..932c9847ccf 100644 --- a/src/platforms/web/runtime/transition-util.js +++ b/src/platforms/web/runtime/transition-util.js @@ -122,11 +122,11 @@ 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(', ') + 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 From d38cfec7c191a0f0b219b2c533750d46832731c0 Mon Sep 17 00:00:00 2001 From: Evan You Date: Tue, 23 Oct 2018 11:39:18 -0400 Subject: [PATCH 2/2] Update transition-util.js --- src/platforms/web/runtime/transition-util.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/platforms/web/runtime/transition-util.js b/src/platforms/web/runtime/transition-util.js index 932c9847ccf..706210141fc 100644 --- a/src/platforms/web/runtime/transition-util.js +++ b/src/platforms/web/runtime/transition-util.js @@ -122,6 +122,7 @@ export function getTransitionInfo (el: Element, expectedType?: ?string): { hasTransform: boolean; } { const styles: any = window.getComputedStyle(el) + // 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)