diff options
| author | Mark Otto <[email protected]> | 2012-01-25 12:43:31 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-01-25 12:43:31 -0800 |
| commit | 1c66779857066e662ff50bc8d6f05987965c0817 (patch) | |
| tree | cfd245d493aa83d580a9e4465d92fdcb3a892605 /js/bootstrap-carousel.js | |
| parent | 2b2c72b9aae6db9505d0fdb3abc1832de8e0ce7f (diff) | |
| parent | 04f84997c18f2f132c8173f728f72b6b7aef52d1 (diff) | |
| download | bootstrap-1c66779857066e662ff50bc8d6f05987965c0817.tar.xz bootstrap-1c66779857066e662ff50bc8d6f05987965c0817.zip | |
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts:
bootstrap.css
Diffstat (limited to 'js/bootstrap-carousel.js')
| -rw-r--r-- | js/bootstrap-carousel.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/js/bootstrap-carousel.js b/js/bootstrap-carousel.js index 3262f0cab..500c7da7f 100644 --- a/js/bootstrap-carousel.js +++ b/js/bootstrap-carousel.js @@ -147,6 +147,7 @@ , $target = $($this.attr('data-target') || $this.attr('href')) , options = !$target.data('modal') && $.extend({}, $target.data(), $this.data()) $target.carousel(options) + e.preventDefault() }) }) |