diff options
| author | Jacob Thornton <[email protected]> | 2012-10-17 21:38:01 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-10-17 21:38:01 -0700 |
| commit | 8e6697f2b20da705377d2a7a2eb6957a4df59d77 (patch) | |
| tree | a74876b2006677d83418b8e967145f2249455d7b /js/bootstrap-carousel.js | |
| parent | ac6625de5fb01067e6f64996c84e93ade654d7d5 (diff) | |
| parent | 0a3e034891255f31f37adb69c2f01fd5f6d259d1 (diff) | |
| download | bootstrap-8e6697f2b20da705377d2a7a2eb6957a4df59d77.tar.xz bootstrap-8e6697f2b20da705377d2a7a2eb6957a4df59d77.zip | |
Merge branch '2.1.2-wip' of github.com:twitter/bootstrap into 2.1.2-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 0d7167e1c..0852cf3f4 100644 --- a/js/bootstrap-carousel.js +++ b/js/bootstrap-carousel.js @@ -167,7 +167,7 @@ $('body').on('click.carousel.data-api', '[data-slide]', function ( e ) { var $this = $(this), href , $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7 - , options = !$target.data('modal') && $.extend({}, $target.data(), $this.data()) + , options = !$target.data('carousel') && $.extend({}, $target.data(), $this.data()) $target.carousel(options) e.preventDefault() }) |