From 2c41b0aea6b2b1d1f1d812ab4455bea4a0759428 Mon Sep 17 00:00:00 2001
From: Johann-S <johann.servoire@gmail.com>
Date: Tue, 13 Mar 2018 10:38:36 +0100
Subject: fix get the transition duration parent

---
 js/src/util.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'js/src')

diff --git a/js/src/util.js b/js/src/util.js
index 05a69977c..1b1f13bea 100644
--- a/js/src/util.js
+++ b/js/src/util.js
@@ -106,19 +106,22 @@ const Util = (($) => {
     },
 
     getTransitionDurationFromElement(element) {
+      if (!element) {
+        return 0
+      }
+
       // Get transition-duration of the element
       let transitionDuration = $(element).css('transition-duration')
+      const floatTransitionDuration = parseFloat(transitionDuration)
 
       // Return 0 if element or transition duration is not found
-      if (!transitionDuration) {
+      if (!floatTransitionDuration) {
         return 0
       }
 
       // If multiple durations are defined, take the first
       transitionDuration = transitionDuration.split(',')[0]
 
-      // jQuery always converts transition durations into seconds,
-      // so multiply by 1000
       return parseFloat(transitionDuration) * MILLISECONDS_MULTIPLIER
     },
 
-- 
cgit v1.2.3