kotovalexarian-likes-github
/
twbs--bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Releases Activity

Carousel: change class check as it can only exist if carousel is sliding 

Also, fix the corresponding test
This commit is contained in:
GeoSot 2022-03-10 02:12:19 +02:00 committed by XhmikosR
parent 3673933fe7
commit 6e904341c9
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
js/src/carousel.js
View File

@ -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)
}

3
js/tests/unit/carousel.spec.js
View File

@ -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)