rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-03-15 15:29:22 +01:00
Code Issues Actions Packages Releases Activity

Merge pull request #11015 from twbs/use-data-ride-carousel

Browse Source 
use data-ride="carousel" in the docs & examples; fixes #11005
This commit is contained in:
Chris Rebert 2013-10-09 19:49:44 -07:00
commit 7016f02e51
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs-assets/js/application.js
View File

@ -90,9 +90,6 @@
btn.button('reset') btn.button('reset')
}, 3000) }, 3000)
}) })
// carousel demo
$('.bs-docs-carousel-example').carousel()
}) })
}(window.jQuery) }(window.jQuery)

2
examples/carousel/index.html
View File

@ -66,7 +66,7 @@
<!-- Carousel <!-- Carousel
================================================== --> ================================================== -->
<div id="myCarousel" class="carousel slide"> <div id="myCarousel" class="carousel slide" data-ride="carousel">
<!-- Indicators --> <!-- Indicators -->
<ol class="carousel-indicators"> <ol class="carousel-indicators">
<li data-target="#myCarousel" data-slide-to="0" class="active"></li> <li data-target="#myCarousel" data-slide-to="0" class="active"></li>

6
javascript.html
View File

@ -1665,7 +1665,7 @@ $('#myCollapsible').on('hidden.bs.collapse', function () {
<h2 id="carousel-examples">Examples</h2> <h2 id="carousel-examples">Examples</h2>
<p>The slideshow below shows a generic plugin and component for cycling through elements like a carousel.</p> <p>The slideshow below shows a generic plugin and component for cycling through elements like a carousel.</p>
<div class="bs-example"> <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"> <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="0" class="active"></li>
<li data-target="#carousel-example-generic" data-slide-to="1"></li> <li data-target="#carousel-example-generic" data-slide-to="1"></li>
@ -1691,7 +1691,7 @@ $('#myCollapsible').on('hidden.bs.collapse', function () {
</div> </div>
</div><!-- /example --> </div><!-- /example -->
{% highlight html %} {% highlight html %}
<div id="carousel-example-generic" class="carousel slide"> <div id="carousel-example-generic" class="carousel slide" data-ride="carousel">
<!-- Indicators --> <!-- Indicators -->
<ol class="carousel-indicators"> <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="0" class="active"></li>
@ -1727,7 +1727,7 @@ $('#myCollapsible').on('hidden.bs.collapse', function () {
<h3>Optional captions</h3> <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> <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 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"> <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="0" class="active"></li>
<li data-target="#carousel-example-captions" data-slide-to="1"></li> <li data-target="#carousel-example-captions" data-slide-to="1"></li>