diff options
| author | Jacob Thornton <[email protected]> | 2013-07-23 18:44:08 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2013-07-23 18:44:08 -0700 |
| commit | f1009c19b31c24df871b97efa74e8e10791bb2c3 (patch) | |
| tree | 2bac5a675e252d6bf81fe6d17f345de508c0f313 /js/carousel.js | |
| parent | 43e5e90a6d871dbbca2ac68429324719692777d3 (diff) | |
| download | bootstrap-f1009c19b31c24df871b97efa74e8e10791bb2c3.tar.xz bootstrap-f1009c19b31c24df871b97efa74e8e10791bb2c3.zip | |
revert collapse change + add emulateTransitionEvent to catch dead css transitions
Diffstat (limited to 'js/carousel.js')
| -rw-r--r-- | js/carousel.js | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/js/carousel.js b/js/carousel.js index 78e878546..4def0cec2 100644 --- a/js/carousel.js +++ b/js/carousel.js @@ -130,12 +130,14 @@ $next[0].offsetWidth // force reflow $active.addClass(direction) $next.addClass(direction) - this.$element.find('.item').one($.support.transition.end, function () { - $next.removeClass([type, direction].join(' ')).addClass('active') - $active.removeClass(['active', direction].join(' ')) - that.sliding = false - setTimeout(function () { that.$element.trigger('slid') }, 0) - }) + this.$element.find('.item') + .one($.support.transition.end, function () { + $next.removeClass([type, direction].join(' ')).addClass('active') + $active.removeClass(['active', direction].join(' ')) + that.sliding = false + setTimeout(function () { that.$element.trigger('slid') }, 0) + }) + .emulateTransitionEnd(600) } else { this.$element.trigger(e) if (e.isDefaultPrevented()) return |