Changes:

* Improved `emulateTransitionEnd` utility, it will now separate `setTimeout` execution only where `supportTransitions` is `false` instead of executing it anyway.
thednp · Feb 4, 2019 · 7b90dc3 · 7b90dc3
1 parent ad245d1
commit 7b90dc3
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/dist/bootstrap-native-v4.js b/dist/bootstrap-native-v4.js
@@ -219,8 +219,8 @@
     },
     emulateTransitionEnd = function(element,handler){ // emulateTransitionEnd since 2.0.4
       var called = 0, duration = getTransitionDurationFromElement(element);
-      supportTransitions && one(element, transitionEndEvent, function(e){ handler(e); called = 1; });
-      setTimeout(function() { !called && handler(); }, duration + 17);
+      supportTransitions ? one(element, transitionEndEvent, function(e){ !called && handler(e), called = 1; })
+                         : setTimeout(function() { !called && handler(), called = 1; }, duration);
     },
     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
@@ -228,8 +228,8 @@
     },
     emulateTransitionEnd = function(element,handler){ // emulateTransitionEnd since 2.0.4
       var called = 0, duration = getTransitionDurationFromElement(element);
-      supportTransitions && one(element, transitionEndEvent, function(e){ handler(e); called = 1; });
-      setTimeout(function() { !called && handler(); }, duration + 17);
+      supportTransitions ? one(element, transitionEndEvent, function(e){ !called && handler(e), called = 1; })
+                         : setTimeout(function() { !called && handler(), called = 1; }, duration);
     },
     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
@@ -204,8 +204,8 @@ var globalObject = typeof global !== 'undefined' ? global : this||window,
   },
   emulateTransitionEnd = function(element,handler){ // emulateTransitionEnd since 2.0.4
     var called = 0, duration = getTransitionDurationFromElement(element);
-    supportTransitions && one(element, transitionEndEvent, function(e){ handler(e); called = 1; });
-    setTimeout(function() { !called && handler(); }, duration + 17);
+    supportTransitions ? one(element, transitionEndEvent, function(e){ !called && handler(e), called = 1; })
+                       : setTimeout(function() { !called && handler(), called = 1; }, duration);
   },
   bootstrapCustomEvent = function (eventName, componentName, related) {
     var OriginalCustomEvent = new CustomEvent( eventName + '.bs.' + componentName);

diff --git a/lib/V4/utils.js b/lib/V4/utils.js
@@ -195,8 +195,8 @@ var globalObject = typeof global !== 'undefined' ? global : this||window,
   },
   emulateTransitionEnd = function(element,handler){ // emulateTransitionEnd since 2.0.4
     var called = 0, duration = getTransitionDurationFromElement(element);
-    supportTransitions && one(element, transitionEndEvent, function(e){ handler(e); called = 1; });
-    setTimeout(function() { !called && handler(); }, duration + 17);
+    supportTransitions ? one(element, transitionEndEvent, function(e){ !called && handler(e), called = 1; })
+                       : setTimeout(function() { !called && handler(), called = 1; }, duration);
   },
   bootstrapCustomEvent = function (eventName, componentName, related) {
     var OriginalCustomEvent = new CustomEvent( eventName + '.bs.' + componentName);