diff options
| author | GeoSot <geo.sotis@gmail.com> | 2022-03-10 03:12:19 +0300 |
|---|---|---|
| committer | XhmikosR <xhmikosr@gmail.com> | 2022-03-10 16:22:14 +0300 |
| commit | 6e904341c9a4a07ea0232850a2dcd4ddc7dfa00a (patch) | |
| tree | 2e16a9a3b45722506cb6ec1329d262a600ae74e6 /js | |
| parent | 3673933fe74b4323267b0b0a7871a393ce2ff5cb (diff) | |
Carousel: change class check as it can only exist if carousel is sliding
Also, fix the corresponding test
Diffstat (limited to 'js')
| -rw-r--r-- | js/src/carousel.js | 3 | ||||
| -rw-r--r-- | js/tests/unit/carousel.spec.js | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/js/src/carousel.js b/js/src/carousel.js index 5a9b2dc846..7a30beb10e 100644 --- a/js/src/carousel.js +++ b/js/src/carousel.js @@ -59,7 +59,6 @@ const SELECTOR_ACTIVE = '.active' const SELECTOR_ITEM = '.carousel-item' const SELECTOR_ACTIVE_ITEM = SELECTOR_ACTIVE + SELECTOR_ITEM const SELECTOR_ITEM_IMG = '.carousel-item img' -const SELECTOR_NEXT_PREV = '.carousel-item-next, .carousel-item-prev' const SELECTOR_INDICATORS = '.carousel-indicators' const SELECTOR_DATA_SLIDE = '[data-bs-slide], [data-bs-slide-to]' const SELECTOR_DATA_RIDE = '[data-bs-ride="carousel"]' @@ -142,7 +141,7 @@ class Carousel extends BaseComponent { this._stayPaused = true } - if (SelectorEngine.findOne(SELECTOR_NEXT_PREV, this._element)) { + if (this._isSliding) { triggerTransitionEnd(this._element) this.cycle(true) } diff --git a/js/tests/unit/carousel.spec.js b/js/tests/unit/carousel.spec.js index 9817b83f1c..8875f3f003 100644 --- a/js/tests/unit/carousel.spec.js +++ b/js/tests/unit/carousel.spec.js @@ -868,7 +868,7 @@ describe('Carousel', () => { }) describe('pause', () => { - it('should call cycle if the carousel have carousel-item-next and carousel-item-prev class', () => { + it('should call cycle if the carousel have carousel-item-next or carousel-item-prev class, cause is sliding', () => { fixtureEl.innerHTML = [ '<div id="myCarousel" class="carousel slide">', ' <div class="carousel-inner">', @@ -887,6 +887,7 @@ describe('Carousel', () => { spyOn(carousel, 'cycle') spyOn(carousel, '_clearInterval') + carousel._slide('next') carousel.pause() expect(carousel.cycle).toHaveBeenCalledWith(true) |