diff options
| author | Jacob Thornton <jacobthornton@gmail.com> | 2012-10-18 10:05:16 +0400 |
|---|---|---|
| committer | Jacob Thornton <jacobthornton@gmail.com> | 2012-10-18 10:05:16 +0400 |
| commit | 7f3b94c45315475a129ace3c22e122808c2dbcaa (patch) | |
| tree | 0b963ce17c8bd8c5f43356da36015daee7295ede /js/bootstrap-carousel.js | |
| parent | 280d4aeb30aa6b29ec74bd801ad1be3fc05e01f4 (diff) | |
| parent | e1f6458e3640a628cdb6b2e4c63950777d46e141 (diff) | |
Merge branch 'delegate-api-to-document' of git://github.com/badcarl/bootstrap into badcarl-delegate-api-to-document
Conflicts:
js/bootstrap-carousel.js
Diffstat (limited to 'js/bootstrap-carousel.js')
| -rw-r--r-- | js/bootstrap-carousel.js | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/js/bootstrap-carousel.js b/js/bootstrap-carousel.js index b533156526..0101f8881a 100644 --- a/js/bootstrap-carousel.js +++ b/js/bootstrap-carousel.js @@ -165,14 +165,12 @@ /* CAROUSEL DATA-API * ================= */ - $(function () { - $('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('carousel') && $.extend({}, $target.data(), $this.data()) - $target.carousel(options) - e.preventDefault() - }) + $(document).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('carousel') && $.extend({}, $target.data(), $this.data()) + $target.carousel(options) + e.preventDefault() }) }(window.jQuery);
\ No newline at end of file |