diff options
| author | fat <[email protected]> | 2014-06-23 23:08:44 -0700 |
|---|---|---|
| committer | fat <[email protected]> | 2014-06-23 23:08:44 -0700 |
| commit | a0e98adebf949e83ffadcd1604ea5c1a3b3fe531 (patch) | |
| tree | 7b88c388d526ada7b564f1faf44cda92276f2722 /js | |
| parent | b31c35b63629ec750f338a646f6b730bd675b734 (diff) | |
| parent | 0aa01f63e33e0fb4c0c770dba7d2a631b9b562d3 (diff) | |
| download | bootstrap-a0e98adebf949e83ffadcd1604ea5c1a3b3fe531.tar.xz bootstrap-a0e98adebf949e83ffadcd1604ea5c1a3b3fe531.zip | |
Merge branch 'fix-13386'
Diffstat (limited to 'js')
| -rw-r--r-- | js/carousel.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/js/carousel.js b/js/carousel.js index d7727bcce..eee2d0f84 100644 --- a/js/carousel.js +++ b/js/carousel.js @@ -199,6 +199,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 |