diff options
| author | Mark Otto <[email protected]> | 2014-01-18 14:11:36 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-01-18 14:11:36 -0800 |
| commit | 689e75e4b1b8055e657b30eb692b34ebf9d549da (patch) | |
| tree | 711f3f78d34a69f34ee40fa24a7e8fc4f961ae00 /js/carousel.js | |
| parent | b886fd2f012f3ebe68292aaedf55d5c3709f972b (diff) | |
| parent | b1721f42cc8298fb691530614ee6d52389872e25 (diff) | |
| download | bootstrap-689e75e4b1b8055e657b30eb692b34ebf9d549da.tar.xz bootstrap-689e75e4b1b8055e657b30eb692b34ebf9d549da.zip | |
Merge branch 'master' into text-emphasis-variant
Diffstat (limited to 'js/carousel.js')
| -rw-r--r-- | js/carousel.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/carousel.js b/js/carousel.js index e1e63f8af..a1617aec7 100644 --- a/js/carousel.js +++ b/js/carousel.js @@ -68,7 +68,7 @@ Carousel.prototype.pause = function (e) { e || (this.paused = true) - if (this.$element.find('.next, .prev').length && $.support.transition.end) { + if (this.$element.find('.next, .prev').length && $.support.transition) { this.$element.trigger($.support.transition.end) this.cycle(true) } |