From: Chris Rebert Date: Thu, 22 May 2014 16:00:19 +0000 (-0700) Subject: fix #13386 X-Git-Tag: v3.2.0~7^2~12^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f071549c8408241b88a95192e477816d2402eb6e;p=thirdparty%2Fbootstrap.git fix #13386 --- diff --git a/js/carousel.js b/js/carousel.js index 05631f7a33..d3e7e52b4e 100644 --- a/js/carousel.js +++ b/js/carousel.js @@ -203,6 +203,7 @@ var href var $this = $(this) var $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7 + if (!$target.hasClass('carousel')) return var options = $.extend({}, $target.data(), $this.data()) var slideIndex = $this.attr('data-slide-to') if (slideIndex) options.interval = false