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:
authorMark Otto <markdotto@gmail.com>2016-11-29 00:39:56 +0300
committerMark Otto <markdotto@gmail.com>2016-11-29 00:39:56 +0300
commit82875586c1ee8d1bc19227bb1e6646a3e87e233d (patch)
treed4d173e362e51f43e363ec4571ae2a3b5977f542 /js/dist/carousel.js
parentd6c1fa37bd6dd9bb99fc3c18750c76a3d8c0a3b3 (diff)
parent4f520c7ff301ce42f01e32bd77606ce94384cd13 (diff)
Merge branch 'v4-js-carousel' of https://github.com/J2TeaM/bootstrap into J2TeaM-v4-js-carousel
Diffstat (limited to 'js/dist/carousel.js')
-rw-r--r--js/dist/carousel.js6
1 files changed, 2 insertions, 4 deletions
diff --git a/js/dist/carousel.js b/js/dist/carousel.js
index f382a641e1..8b6119a074 100644
--- a/js/dist/carousel.js
+++ b/js/dist/carousel.js
@@ -335,11 +335,9 @@ var Carousel = function ($) {
$(nextElement).addClass(directionalClassName);
$(activeElement).one(Util.TRANSITION_END, function () {
- $(nextElement).removeClass(directionalClassName).removeClass(direction);
+ $(nextElement).removeClass(directionalClassName + ' ' + direction).addClass(ClassName.ACTIVE);
- $(nextElement).addClass(ClassName.ACTIVE);
-
- $(activeElement).removeClass(ClassName.ACTIVE).removeClass(direction).removeClass(directionalClassName);
+ $(activeElement).removeClass(ClassName.ACTIVE + ' ' + direction + ' ' + directionalClassName);
_this3._isSliding = false;