aboutsummaryrefslogtreecommitdiff
path: root/docs/templates
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-12-19 23:39:40 -0800
committerMark Otto <[email protected]>2012-12-19 23:39:40 -0800
commit5d776bcfd2e7da0bcce37252dc983149d8b2d377 (patch)
tree0b46eb3b33008f4d4b4ea3bd73ce82ed77218d7d /docs/templates
parentdc6142751feced6761f67503323c0c6e62844d4e (diff)
parentbbe4625672c5122bb2b06c495f9ea41752c10467 (diff)
downloadbootstrap-5d776bcfd2e7da0bcce37252dc983149d8b2d377.tar.xz
bootstrap-5d776bcfd2e7da0bcce37252dc983149d8b2d377.zip
Merge branch '2.2.3' of github.com:twitter/bootstrap into 2.2.3
Diffstat (limited to 'docs/templates')
-rw-r--r--docs/templates/pages/javascript.mustache13
1 files changed, 5 insertions, 8 deletions
diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index e6b3f812a..de7977667 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -1352,6 +1352,11 @@ $('#myCollapsible').on('hidden', function () {
<p>{{_i}}The slideshow below shows a generic plugin and component for cycling through elements like a carousel.{{/i}}</p>
<div class="bs-docs-example">
<div id="myCarousel" class="carousel slide">
+ <ol class="carousel-indicators">
+ <li class="active"></li>
+ <li></li>
+ <li></li>
+ </ol>
<div class="carousel-inner">
<div class="item active">
<img src="assets/img/bootstrap-mdo-sfmoma-01.jpg" alt="">
@@ -1601,14 +1606,6 @@ $('.carousel').carousel({
<p>{{_i}}Call the affix plugin via JavaScript:{{/i}}</p>
<pre class="prettyprint linenums">$('#navbar').affix()</pre>
- <h3>{{_i}}Methods{{/i}}</h3>
- <h4>.affix('refresh')</h4>
- <p>{{_i}}When using affix in conjunction with adding or removing of elements from the DOM, you'll want to call the refresh method:{{/i}}</p>
-<pre class="prettyprint linenums">
-$('[data-spy="affix"]').each(function () {
- $(this).affix('refresh')
-});
-</pre>
<h3>{{_i}}Options{{/i}}</h3>
<p>{{_i}}Options can be passed via data attributes or JavaScript. For data attributes, append the option name to <code>data-</code>, as in <code>data-offset-top="200"</code>.{{/i}}</p>
<table class="table table-bordered table-striped">