aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorfat <[email protected]>2013-07-17 21:08:50 -0700
committerfat <[email protected]>2013-07-17 21:08:50 -0700
commiteb3333a612c4125ba2fa9f8825f70cc12cd9b439 (patch)
treee0a6ae6132dbd7baef231eff506ec81f11f7e0cf /js
parent0f64c21049dc5f3f184ec28bdab770f5c4ad594e (diff)
downloadbootstrap-eb3333a612c4125ba2fa9f8825f70cc12cd9b439.tar.xz
bootstrap-eb3333a612c4125ba2fa9f8825f70cc12cd9b439.zip
fix #7000
Diffstat (limited to 'js')
-rw-r--r--js/carousel.js5
1 files changed, 3 insertions, 2 deletions
diff --git a/js/carousel.js b/js/carousel.js
index 547007d2d..b014de270 100644
--- a/js/carousel.js
+++ b/js/carousel.js
@@ -189,12 +189,13 @@
var $this = $(this), href
var $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
var options = $.extend({}, $target.data(), $this.data())
- var slideIndex
+ var slideIndex = $this.attr('data-slide-to')
+ if (slideIndex) options.interval = false
$target.carousel(options)
if (slideIndex = $this.attr('data-slide-to')) {
- $target.data('bs.carousel').pause().to(slideIndex).cycle()
+ $target.data('bs.carousel').to(slideIndex)
}
e.preventDefault()