mod/bootstrap/vendor/bootstrap/js/src/tab.js in card-1.94.1 vs mod/bootstrap/vendor/bootstrap/js/src/tab.js in card-1.95.0
- old
+ new
@@ -1,11 +1,11 @@
import $ from 'jquery'
import Util from './util'
/**
* --------------------------------------------------------------------------
- * Bootstrap (v4.0.0): tab.js
+ * Bootstrap (v4.1.1): tab.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
const Tab = (($) => {
@@ -13,17 +13,16 @@
* ------------------------------------------------------------------------
* Constants
* ------------------------------------------------------------------------
*/
- const NAME = 'tab'
- const VERSION = '4.0.0'
- const DATA_KEY = 'bs.tab'
- const EVENT_KEY = `.${DATA_KEY}`
- const DATA_API_KEY = '.data-api'
- const JQUERY_NO_CONFLICT = $.fn[NAME]
- const TRANSITION_DURATION = 150
+ const NAME = 'tab'
+ const VERSION = '4.1.1'
+ const DATA_KEY = 'bs.tab'
+ const EVENT_KEY = `.${DATA_KEY}`
+ const DATA_API_KEY = '.data-api'
+ const JQUERY_NO_CONFLICT = $.fn[NAME]
const Event = {
HIDE : `hide${EVENT_KEY}`,
HIDDEN : `hidden${EVENT_KEY}`,
SHOW : `show${EVENT_KEY}`,
@@ -150,22 +149,23 @@
activeElements = $(container).children(Selector.ACTIVE)
}
const active = activeElements[0]
const isTransitioning = callback &&
- Util.supportsTransitionEnd() &&
(active && $(active).hasClass(ClassName.FADE))
const complete = () => this._transitionComplete(
element,
active,
callback
)
if (active && isTransitioning) {
+ const transitionDuration = Util.getTransitionDurationFromElement(active)
+
$(active)
.one(Util.TRANSITION_END, complete)
- .emulateTransitionEnd(TRANSITION_DURATION)
+ .emulateTransitionEnd(transitionDuration)
} else {
complete()
}
}