rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-01 13:24:25 +01:00
Code Issues Actions Packages Releases Activity

Carousel: move carousel default interval to _getConfig() and simplify it

Browse Source
This commit is contained in:
GeoSot 2021-09-10 02:11:14 +03:00 committed by XhmikosR
parent 6f79721c82
commit ff4bf4a458
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
js/src/carousel.js
View File

@ -161,7 +161,7 @@ class Carousel extends BaseComponent {
this._interval = null this._interval = null
} }
if (this._config && this._config.interval && !this._isPaused) { if (this._config.interval && !this._isPaused) {
this._updateInterval() this._updateInterval()
this._interval = setInterval( this._interval = setInterval(
@ -206,6 +206,11 @@ class Carousel extends BaseComponent {
} }
// Private // Private
_configAfterMerge(config) {
config.defaultInterval = config.interval
return config
}
_addEventListeners() { _addEventListeners() {
if (this._config.keyboard) { if (this._config.keyboard) {
EventHandler.on(this._element, EVENT_KEYDOWN, event => this._keydown(event)) EventHandler.on(this._element, EVENT_KEYDOWN, event => this._keydown(event))
@ -318,12 +323,7 @@ class Carousel extends BaseComponent {
const elementInterval = Number.parseInt(element.getAttribute('data-bs-interval'), 10) const elementInterval = Number.parseInt(element.getAttribute('data-bs-interval'), 10)
if (elementInterval) { this._config.interval = elementInterval || this._config.defaultInterval
this._config.defaultInterval = this._config.defaultInterval || this._config.interval
this._config.interval = elementInterval
} else {
this._config.interval = this._config.defaultInterval || this._config.interval
}
} }
_slide(directionOrOrder, element) { _slide(directionOrOrder, element) {