mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-09-27 05:49:07 +02:00
Code Issues Releases Wiki Activity

chore(update): bump to 4.1.3

Browse Source
This commit is contained in:
Johann-S
2018-07-25 11:29:16 +02:00
committed by XhmikosR
parent cf821e1d4d
commit c44db783bf
28 changed files with 231 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
js/src/carousel.js
View File

@@ -178,7 +178,7 @@ class Carousel {
this._interval = null
}
if (this._config.interval && !this._isPaused) {
if (this._config && this._config.interval && !this._isPaused) {
this._interval = setInterval(
(document.visibilityState ? this.nextWhenVisible : this.next).bind(this),
this._config.interval
@@ -298,7 +298,7 @@ class Carousel {
}
const end = (event) => {
if (this._pointerEvent && PointerType[event.originalEvent.pointerType.toUpperCase()]) {
if (this._pointerEvent && PointerType[event.pointerType.toUpperCase()]) {
this.touchDeltaX = event.clientX - this.touchStartX
}
@@ -464,6 +464,14 @@ class Carousel {
activeElement.classList.add(directionalClassName)
nextElement.classList.add(directionalClassName)
const nextElementInterval = parseInt(nextElement.getAttribute('data-interval'), 10)
if (nextElementInterval) {
this._config.defaultInterval = this._config.defaultInterval || this._config.interval
this._config.interval = nextElementInterval
} else {
this._config.interval = this._config.defaultInterval || this._config.interval
}
const transitionDuration = Util.getTransitionDurationFromElement(activeElement)
EventHandler