Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeoSot <geo.sotis@gmail.com>2022-03-10 01:01:55 +0300
committerXhmikosR <xhmikosr@gmail.com>2022-03-10 16:22:14 +0300
commit28f150d7204788114e2b36555f5e07eb8bdfdbab (patch)
treef28d46466d8e3608aed680d7a26b97b5bf5f04b1
parent3ef6a435be5fe13f8b46c3a949aa0ddc5c3e6ef1 (diff)
Carousel: omit config merging in jQueryInterface after we create the instance
This is already done inside `getOrCreateInstance` method
-rw-r--r--js/src/carousel.js10
1 files changed, 1 insertions, 9 deletions
diff --git a/js/src/carousel.js b/js/src/carousel.js
index f5917eb7f4..37ebde3fcc 100644
--- a/js/src/carousel.js
+++ b/js/src/carousel.js
@@ -417,14 +417,6 @@ class Carousel extends BaseComponent {
return this.each(function () {
const data = Carousel.getOrCreateInstance(this, config)
- let { _config } = data
- if (typeof config === 'object') {
- _config = {
- ..._config,
- ...config
- }
- }
-
if (typeof config === 'number') {
data.to(config)
return
@@ -439,7 +431,7 @@ class Carousel extends BaseComponent {
return
}
- if (_config.interval && _config.ride) {
+ if (data._config.interval && data._config.ride) {
data.pause()
data.cycle()
}