Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohann-S <johann.servoire@gmail.com>2018-03-20 13:07:58 +0300
committerJohann-S <johann.servoire@gmail.com>2018-03-20 17:56:51 +0300
commitbedc96e48bebb7a1124a97833794a8047a1e3b95 (patch)
tree0db43f0a301cf836fb9198a4957231a097a90f06 /js/src/carousel.js
parent2306f62bf19bb0696a9455aaf2eea6b083d9fdae (diff)
Use transitionEnd in QUnit since we moved away from PhantomJS
Diffstat (limited to 'js/src/carousel.js')
-rw-r--r--js/src/carousel.js6
1 files changed, 2 insertions, 4 deletions
diff --git a/js/src/carousel.js b/js/src/carousel.js
index 54bb0791c9..0c192cd7d1 100644
--- a/js/src/carousel.js
+++ b/js/src/carousel.js
@@ -142,8 +142,7 @@ const Carousel = (($) => {
this._isPaused = true
}
- if ($(this._element).find(Selector.NEXT_PREV)[0] &&
- Util.supportsTransitionEnd()) {
+ if ($(this._element).find(Selector.NEXT_PREV)[0]) {
Util.triggerTransitionEnd(this._element)
this.cycle(true)
}
@@ -376,8 +375,7 @@ const Carousel = (($) => {
to: nextElementIndex
})
- if (Util.supportsTransitionEnd() &&
- $(this._element).hasClass(ClassName.SLIDE)) {
+ if ($(this._element).hasClass(ClassName.SLIDE)) {
$(nextElement).addClass(orderClassName)
Util.reflow(nextElement)