diff options
| author | Mark Otto <[email protected]> | 2020-04-13 15:34:08 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-04-13 15:34:08 -0700 |
| commit | febdcefcd7d65b02b9d23807d7940b1e60053f43 (patch) | |
| tree | 16b6ac57144ca5bcf8faa25bd4cdfbd6fbd86402 /js/src/carousel.js | |
| parent | 232de79db8efb39a925b340a8b3de4e5834de643 (diff) | |
| parent | 1004e3e786f707853043dd427317cd4033a04211 (diff) | |
| download | bootstrap-febdcefcd7d65b02b9d23807d7940b1e60053f43.tar.xz bootstrap-febdcefcd7d65b02b9d23807d7940b1e60053f43.zip | |
Merge branch 'master' into release-drafter
Diffstat (limited to 'js/src/carousel.js')
| -rw-r--r-- | js/src/carousel.js | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/js/src/carousel.js b/js/src/carousel.js index 509f7ca9d..a5451538c 100644 --- a/js/src/carousel.js +++ b/js/src/carousel.js @@ -118,7 +118,7 @@ class Carousel { this._element = element this._indicatorsElement = SelectorEngine.findOne(SELECTOR_INDICATORS, this._element) this._touchSupported = 'ontouchstart' in document.documentElement || navigator.maxTouchPoints > 0 - this._pointerEvent = Boolean(window.PointerEvent || window.MSPointerEvent) + this._pointerEvent = Boolean(window.PointerEvent) this._addEventListeners() Data.setData(element, DATA_KEY, this) @@ -478,13 +478,10 @@ class Carousel { EventHandler .one(activeElement, TRANSITION_END, () => { - nextElement.classList.remove(directionalClassName) - nextElement.classList.remove(orderClassName) + nextElement.classList.remove(directionalClassName, orderClassName) nextElement.classList.add(CLASS_NAME_ACTIVE) - activeElement.classList.remove(CLASS_NAME_ACTIVE) - activeElement.classList.remove(orderClassName) - activeElement.classList.remove(directionalClassName) + activeElement.classList.remove(CLASS_NAME_ACTIVE, orderClassName, directionalClassName) this._isSliding = false |