From 68b771a057b60ca5740cf9a1b0f8f9ec73e5dc56 Mon Sep 17 00:00:00 2001 From: Ben-Russell Date: Tue, 26 Aug 2014 14:34:21 -0700 Subject: Independently delegate data-api selectors Fixes #14462. Closes #14463 by merging it. --- js/carousel.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'js/carousel.js') diff --git a/js/carousel.js b/js/carousel.js index b68899009..8884424ef 100644 --- a/js/carousel.js +++ b/js/carousel.js @@ -207,7 +207,7 @@ // CAROUSEL DATA-API // ================= - $(document).on('click.bs.carousel.data-api', '[data-slide], [data-slide-to]', function (e) { + var clickHandler = function (e) { var href var $this = $(this) var $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) // strip for ie7 @@ -223,7 +223,11 @@ } e.preventDefault() - }) + } + + $(document) + .on('click.bs.carousel.data-api', '[data-slide]', clickHandler) + .on('click.bs.carousel.data-api', '[data-slide-to]', clickHandler) $(window).on('load', function () { $('[data-ride="carousel"]').each(function () { -- cgit v1.2.3