aboutsummaryrefslogtreecommitdiff
path: root/js/carousel.js
diff options
context:
space:
mode:
authorIvan Khalopik <[email protected]>2013-06-10 10:31:51 +0300
committerIvan Khalopik <[email protected]>2013-06-10 10:31:51 +0300
commite138b0df3a1bcd536cc312d7c4714ff5bc9acd2b (patch)
tree2d6f41184d19466d6f9fa016ba521260413435cb /js/carousel.js
parent3285f4c3062f4a56eaed2461a3128a2e6a3ba9cc (diff)
parentd74a9634b0cb21a712f5e805c7a21132dc9bee5e (diff)
downloadbootstrap-e138b0df3a1bcd536cc312d7c4714ff5bc9acd2b.tar.xz
bootstrap-e138b0df3a1bcd536cc312d7c4714ff5bc9acd2b.zip
Merge remote-tracking branch 'bootstrap/3.0.0-wip' into 3.0.0-wip
Diffstat (limited to 'js/carousel.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()