diff options
| author | billy gates <[email protected]> | 2012-10-17 21:25:21 -0700 |
|---|---|---|
| committer | billy gates <[email protected]> | 2012-10-17 21:25:21 -0700 |
| commit | 97bf02d78791c08a7d459d532ca3ce9ec8d457a1 (patch) | |
| tree | 7f6b99aaf50a72868b1ab4e063029c8bd2b311d2 /js/bootstrap-carousel.js | |
| parent | 3074737d90f1f8f77e0dde3473f4bbe870a217b8 (diff) | |
| parent | ae0ba0686efcbf73116a21eb9aff3f9bede4a489 (diff) | |
| download | bootstrap-97bf02d78791c08a7d459d532ca3ce9ec8d457a1.tar.xz bootstrap-97bf02d78791c08a7d459d532ca3ce9ec8d457a1.zip | |
Merge pull request #5531 from dmitriybudnik/carousel-js-typo-fix
Fixed copy/paste caused typo
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() }) |