From c148fe6a078684779b8a952cf699e35bbd1c8a3f Mon Sep 17 00:00:00 2001 From: GeoSot Date: Fri, 10 Sep 2021 02:11:14 +0300 Subject: Simplify carousel-items interval update --- js/src/carousel.js | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/js/src/carousel.js b/js/src/carousel.js index ca66ed384..80a652c88 100644 --- a/js/src/carousel.js +++ b/js/src/carousel.js @@ -177,7 +177,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( @@ -222,6 +222,7 @@ class Carousel extends BaseComponent { ...(typeof config === 'object' ? config : {}) } typeCheckConfig(NAME, config, DefaultType) + config.defaultInterval = config.interval return config } @@ -383,12 +384,7 @@ class Carousel extends BaseComponent { const elementInterval = Number.parseInt(Manipulator.getDataAttribute(element, '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) { -- cgit v1.2.3