From ff4bf4a458d1bfab6a3cb8803e762fdb0de8bc3e Mon Sep 17 00:00:00 2001
From: GeoSot <geo.sotis@gmail.com>
Date: Fri, 10 Sep 2021 02:11:14 +0300
Subject: [PATCH] Carousel: move carousel default interval to `_getConfig()`
 and simplify it

---
 js/src/carousel.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/js/src/carousel.js b/js/src/carousel.js
index 856d70dac0..336bcd261a 100644
--- a/js/src/carousel.js
+++ b/js/src/carousel.js
@@ -161,7 +161,7 @@ class Carousel extends BaseComponent {
       this._interval = null
     }
 
-    if (this._config && this._config.interval && !this._isPaused) {
+    if (this._config.interval && !this._isPaused) {
       this._updateInterval()
 
       this._interval = setInterval(
@@ -206,6 +206,11 @@ class Carousel extends BaseComponent {
   }
 
   // Private
+  _configAfterMerge(config) {
+    config.defaultInterval = config.interval
+    return config
+  }
+
   _addEventListeners() {
     if (this._config.keyboard) {
       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)
 
-    if (elementInterval) {
-      this._config.defaultInterval = this._config.defaultInterval || this._config.interval
-      this._config.interval = elementInterval
-    } else {
-      this._config.interval = this._config.defaultInterval || this._config.interval
-    }
+    this._config.interval = elementInterval || this._config.defaultInterval
   }
 
   _slide(directionOrOrder, element) {