diff options
| author | Mark Otto <[email protected]> | 2014-01-18 14:12:04 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-01-18 14:12:04 -0800 |
| commit | cfe38a424102881b2af7db455a3d32e34ccca6e2 (patch) | |
| tree | 25906e66e268121f51b12801ecc7d5fe9c474a29 /js/carousel.js | |
| parent | b2e88d1359606ddf0a052d245db79ef70bd68dcd (diff) | |
| parent | b1721f42cc8298fb691530614ee6d52389872e25 (diff) | |
| download | bootstrap-cfe38a424102881b2af7db455a3d32e34ccca6e2.tar.xz bootstrap-cfe38a424102881b2af7db455a3d32e34ccca6e2.zip | |
Merge branch 'master' into modal-md
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) } |