aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-06-02 14:08:50 -0700
committerMark Otto <[email protected]>2013-06-02 14:08:50 -0700
commitbd170e8366ca959e854d7f6c338988bd3ee594a7 (patch)
treea5a7bdc2024ea33498b403cc45d3848471915255 /js
parent19d0726609f860d4a7f1c214965164084aaf8a5f (diff)
parentddf95c91dba31a43bcfda579d800d6f5cdbd2fef (diff)
downloadbootstrap-bd170e8366ca959e854d7f6c338988bd3ee594a7.tar.xz
bootstrap-bd170e8366ca959e854d7f6c338988bd3ee594a7.zip
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Diffstat (limited to 'js')
-rw-r--r--js/carousel.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/carousel.js b/js/carousel.js
index 0da8e41ca..547007d2d 100644
--- a/js/carousel.js
+++ b/js/carousel.js
@@ -194,7 +194,7 @@
$target.carousel(options)
if (slideIndex = $this.attr('data-slide-to')) {
- $target.data('bs-carousel').pause().to(slideIndex).cycle()
+ $target.data('bs.carousel').pause().to(slideIndex).cycle()
}
e.preventDefault()