diff options
| author | Mark Otto <[email protected]> | 2012-06-04 08:33:48 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-06-04 08:33:48 -0700 |
| commit | 37ba0eba024944ab13d2fd093d3e12340430fecd (patch) | |
| tree | 4af1a53c0384f3c2cc01fc8522a1f18841fc0719 /js/bootstrap-carousel.js | |
| parent | eb3a4b8f759299e4157bd32deb6016587f48acb4 (diff) | |
| parent | 82ea5847a7188b2798c5dbb0792e53ee8f60db55 (diff) | |
| download | bootstrap-37ba0eba024944ab13d2fd093d3e12340430fecd.tar.xz bootstrap-37ba0eba024944ab13d2fd093d3e12340430fecd.zip | |
Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip
Diffstat (limited to 'js/bootstrap-carousel.js')
| -rw-r--r-- | js/bootstrap-carousel.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/bootstrap-carousel.js b/js/bootstrap-carousel.js index 1bb8f5a06..f8f3c6451 100644 --- a/js/bootstrap-carousel.js +++ b/js/bootstrap-carousel.js @@ -68,7 +68,7 @@ , pause: function (e) { if (!e) this.paused = true - if (this.$element.find('.next, .prev') && $.support.transition.end) { + if (this.$element.find('.next, .prev').length && $.support.transition.end) { this.$element.trigger($.support.transition.end) this.cycle() } |