Change:

* A more consistent way to better include `transitionDuration` into `emulateTransitionEnd` utility
thednp · Feb 4, 2019 · 507c35d · 507c35d
1 parent 7b90dc3
commit 507c35d
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/dist/bootstrap-native-v4.js b/dist/bootstrap-native-v4.js
@@ -215,12 +215,12 @@
       var duration = supportTransitions ? globalObject[getComputedStyle](element)[transitionDuration] : 0;
       duration = parseFloat(duration);
       duration = typeof duration === 'number' && !isNaN(duration) ? duration * 1000 : 0;
-      return duration + 17; // we take a short offset to make sure we fire on the next frame after animation
+      return duration; // we take a short offset to make sure we fire on the next frame after animation
     },
     emulateTransitionEnd = function(element,handler){ // emulateTransitionEnd since 2.0.4
       var called = 0, duration = getTransitionDurationFromElement(element);
-      supportTransitions ? one(element, transitionEndEvent, function(e){ !called && handler(e), called = 1; })
-                         : setTimeout(function() { !called && handler(), called = 1; }, duration);
+      duration ? one(element, transitionEndEvent, function(e){ !called && handler(e), called = 1; })
+               : setTimeout(function() { !called && handler(), called = 1; }, 17);
     },
     bootstrapCustomEvent = function (eventName, componentName, related) {
       var OriginalCustomEvent = new CustomEvent( eventName + '.bs.' + componentName);

diff --git a/dist/bootstrap-native-v4.min.js b/dist/bootstrap-native-v4.min.js
diff --git a/dist/bootstrap-native.js b/dist/bootstrap-native.js
@@ -224,12 +224,12 @@
       var duration = supportTransitions ? globalObject[getComputedStyle](element)[transitionDuration] : 0;
       duration = parseFloat(duration);
       duration = typeof duration === 'number' && !isNaN(duration) ? duration * 1000 : 0;
-      return duration + 17; // we take a short offset to make sure we fire on the next frame after animation
+      return duration; // we take a short offset to make sure we fire on the next frame after animation
     },
     emulateTransitionEnd = function(element,handler){ // emulateTransitionEnd since 2.0.4
       var called = 0, duration = getTransitionDurationFromElement(element);
-      supportTransitions ? one(element, transitionEndEvent, function(e){ !called && handler(e), called = 1; })
-                         : setTimeout(function() { !called && handler(), called = 1; }, duration);
+      duration ? one(element, transitionEndEvent, function(e){ !called && handler(e), called = 1; })
+               : setTimeout(function() { !called && handler(), called = 1; }, 17);
     },
     bootstrapCustomEvent = function (eventName, componentName, related) {
       var OriginalCustomEvent = new CustomEvent( eventName + '.bs.' + componentName);

diff --git a/dist/bootstrap-native.min.js b/dist/bootstrap-native.min.js
diff --git a/lib/V3/utils.js b/lib/V3/utils.js
@@ -200,12 +200,12 @@ var globalObject = typeof global !== 'undefined' ? global : this||window,
     var duration = supportTransitions ? globalObject[getComputedStyle](element)[transitionDuration] : 0;
     duration = parseFloat(duration);
     duration = typeof duration === 'number' && !isNaN(duration) ? duration * 1000 : 0;
-    return duration + 17; // we take a short offset to make sure we fire on the next frame after animation
+    return duration; // we take a short offset to make sure we fire on the next frame after animation
   },
   emulateTransitionEnd = function(element,handler){ // emulateTransitionEnd since 2.0.4
     var called = 0, duration = getTransitionDurationFromElement(element);
-    supportTransitions ? one(element, transitionEndEvent, function(e){ !called && handler(e), called = 1; })
-                       : setTimeout(function() { !called && handler(), called = 1; }, duration);
+    duration ? one(element, transitionEndEvent, function(e){ !called && handler(e), called = 1; })
+             : setTimeout(function() { !called && handler(), called = 1; }, 17);
   },
   bootstrapCustomEvent = function (eventName, componentName, related) {
     var OriginalCustomEvent = new CustomEvent( eventName + '.bs.' + componentName);

diff --git a/lib/V4/utils.js b/lib/V4/utils.js
@@ -191,12 +191,12 @@ var globalObject = typeof global !== 'undefined' ? global : this||window,
     var duration = supportTransitions ? globalObject[getComputedStyle](element)[transitionDuration] : 0;
     duration = parseFloat(duration);
     duration = typeof duration === 'number' && !isNaN(duration) ? duration * 1000 : 0;
-    return duration + 17; // we take a short offset to make sure we fire on the next frame after animation
+    return duration; // we take a short offset to make sure we fire on the next frame after animation
   },
   emulateTransitionEnd = function(element,handler){ // emulateTransitionEnd since 2.0.4
     var called = 0, duration = getTransitionDurationFromElement(element);
-    supportTransitions ? one(element, transitionEndEvent, function(e){ !called && handler(e), called = 1; })
-                       : setTimeout(function() { !called && handler(), called = 1; }, duration);
+    duration ? one(element, transitionEndEvent, function(e){ !called && handler(e), called = 1; })
+             : setTimeout(function() { !called && handler(), called = 1; }, 17);
   },
   bootstrapCustomEvent = function (eventName, componentName, related) {
     var OriginalCustomEvent = new CustomEvent( eventName + '.bs.' + componentName);