aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Rebert <[email protected]>2013-10-09 19:29:25 -0700
committerChris Rebert <[email protected]>2013-10-09 19:29:27 -0700
commitef1fc34e616a0efda482ec54247a84d589244d55 (patch)
tree0b6b76c9fe7a238ccd3a05994374e9d194f3d657
parent4da37222cf5b7f6924940fcc543c1727d5b563f2 (diff)
downloadbootstrap-ef1fc34e616a0efda482ec54247a84d589244d55.tar.xz
bootstrap-ef1fc34e616a0efda482ec54247a84d589244d55.zip
use data-ride="carousel" in the docs & examples; fixes #11005
-rw-r--r--docs-assets/js/application.js3
-rw-r--r--examples/carousel/index.html2
-rw-r--r--javascript.html6
3 files changed, 4 insertions, 7 deletions
diff --git a/docs-assets/js/application.js b/docs-assets/js/application.js
index 76c24e5a6..44b2e12ad 100644
--- a/docs-assets/js/application.js
+++ b/docs-assets/js/application.js
@@ -90,9 +90,6 @@
btn.button('reset')
}, 3000)
})
-
- // carousel demo
- $('.bs-docs-carousel-example').carousel()
})
}(window.jQuery)
diff --git a/examples/carousel/index.html b/examples/carousel/index.html
index a57cab745..c9a99cbd6 100644
--- a/examples/carousel/index.html
+++ b/examples/carousel/index.html
@@ -66,7 +66,7 @@
<!-- Carousel
================================================== -->
- <div id="myCarousel" class="carousel slide">
+ <div id="myCarousel" class="carousel slide" data-ride="carousel">
<!-- Indicators -->
<ol class="carousel-indicators">
<li data-target="#myCarousel" data-slide-to="0" class="active"></li>
diff --git a/javascript.html b/javascript.html
index 67cc9779f..5eb742cd2 100644
--- a/javascript.html
+++ b/javascript.html
@@ -1665,7 +1665,7 @@ $('#myCollapsible').on('hidden.bs.collapse', function () {
<h2 id="carousel-examples">Examples</h2>
<p>The slideshow below shows a generic plugin and component for cycling through elements like a carousel.</p>
<div class="bs-example">
- <div id="carousel-example-generic" class="carousel slide bs-docs-carousel-example">
+ <div id="carousel-example-generic" class="carousel slide" data-ride="carousel">
<ol class="carousel-indicators">
<li data-target="#carousel-example-generic" data-slide-to="0" class="active"></li>
<li data-target="#carousel-example-generic" data-slide-to="1"></li>
@@ -1691,7 +1691,7 @@ $('#myCollapsible').on('hidden.bs.collapse', function () {
</div>
</div><!-- /example -->
{% highlight html %}
-<div id="carousel-example-generic" class="carousel slide">
+<div id="carousel-example-generic" class="carousel slide" data-ride="carousel">
<!-- Indicators -->
<ol class="carousel-indicators">
<li data-target="#carousel-example-generic" data-slide-to="0" class="active"></li>
@@ -1727,7 +1727,7 @@ $('#myCollapsible').on('hidden.bs.collapse', function () {
<h3>Optional captions</h3>
<p>Add captions to your slides easily with the <code>.carousel-caption</code> element within any <code>.item</code>. Place just about any optional HTML within there and it will be automatically aligned and formatted.</p>
<div class="bs-example">
- <div id="carousel-example-captions" class="carousel slide bs-docs-carousel-example">
+ <div id="carousel-example-captions" class="carousel slide" data-ride="carousel">
<ol class="carousel-indicators">
<li data-target="#carousel-example-captions" data-slide-to="0" class="active"></li>
<li data-target="#carousel-example-captions" data-slide-to="1"></li>