From eb8d5b43cedc76d88331f4d2f6ed3bca10e573ff Mon Sep 17 00:00:00 2001 From: GeoSot Date: Sat, 19 Feb 2022 19:04:50 +0200 Subject: [PATCH] Carousel: move `carouselInterface` inside `jqueryInterface` --- js/src/carousel.js | 48 +++++++++++++++++++++------------------------- 1 file changed, 22 insertions(+), 26 deletions(-) diff --git a/js/src/carousel.js b/js/src/carousel.js index 12102f2246..4262d60dfd 100644 --- a/js/src/carousel.js +++ b/js/src/carousel.js @@ -432,36 +432,32 @@ class Carousel extends BaseComponent { } // Static - static carouselInterface(element, config) { - const data = Carousel.getOrCreateInstance(element, config) - - let { _config } = data - if (typeof config === 'object') { - _config = { - ..._config, - ...config + static jQueryInterface(config) { + return this.each(function () { + const data = Carousel.getOrCreateInstance(this, config) + + let { _config } = data + if (typeof config === 'object') { + _config = { + ..._config, + ...config + } } - } - const action = typeof config === 'string' ? config : _config.slide - - if (typeof config === 'number') { - data.to(config) - } else if (typeof action === 'string') { - if (typeof data[action] === 'undefined') { - throw new TypeError(`No method named "${action}"`) - } + const action = typeof config === 'string' ? config : _config.slide - data[action]() - } else if (_config.interval && _config.ride) { - data.pause() - data.cycle() - } - } + if (typeof config === 'number') { + data.to(config) + } else if (typeof action === 'string') { + if (typeof data[action] === 'undefined') { + throw new TypeError(`No method named "${action}"`) + } - static jQueryInterface(config) { - return this.each(function () { - Carousel.carouselInterface(this, config) + data[action]() + } else if (_config.interval && _config.ride) { + data.pause() + data.cycle() + } }) } } -- 2.47.2