diff options
Diffstat (limited to 'js/src')
| -rw-r--r-- | js/src/util.js | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/js/src/util.js b/js/src/util.js index 622b46837..92ad2a722 100644 --- a/js/src/util.js +++ b/js/src/util.js @@ -93,17 +93,21 @@ const Util = { // Get transition-duration of the element let transitionDuration = $(element).css('transition-duration') + let transitionDelay = $(element).css('transition-delay') + const floatTransitionDuration = parseFloat(transitionDuration) + const floatTransitionDelay = parseFloat(transitionDelay) // Return 0 if element or transition duration is not found - if (!floatTransitionDuration) { + if (!floatTransitionDuration && !floatTransitionDelay) { return 0 } // If multiple durations are defined, take the first transitionDuration = transitionDuration.split(',')[0] + transitionDelay = transitionDelay.split(',')[0] - return parseFloat(transitionDuration) * MILLISECONDS_MULTIPLIER + return (parseFloat(transitionDuration) + parseFloat(transitionDelay)) * MILLISECONDS_MULTIPLIER }, reflow(element) { |