diff options
| author | Mark Otto <[email protected]> | 2012-08-19 11:54:05 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-08-19 11:54:05 -0700 |
| commit | 8e271d664b80f7e04528ba25b81dfc4a7b316df7 (patch) | |
| tree | ae08c7c37ae0a6333ddf10e46c5a2cbeb37f61bc /docs/javascript.html | |
| parent | c531a75ff00fd58a6d1c05a944145ff165dba837 (diff) | |
| parent | c9cef741f6d97bb8549af8e4809fccce4339f2f4 (diff) | |
| download | bootstrap-8e271d664b80f7e04528ba25b81dfc4a7b316df7.tar.xz bootstrap-8e271d664b80f7e04528ba25b81dfc4a7b316df7.zip | |
Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip
Diffstat (limited to 'docs/javascript.html')
| -rw-r--r-- | docs/javascript.html | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/docs/javascript.html b/docs/javascript.html index 79de4f6a5..4a4fb41eb 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -566,7 +566,7 @@ $('#myModal').on('hidden', function () { <h2>Usage</h2> <h3>Via data attributes</h3> - <p>To easily add scrollspy behavior to your topbar navigation, just add <code>data-spy="scroll"</code> to the element you want to spy on (most typically this would be the body) and <code>data-target=".navbar"</code> to select which nav to use.</p> + <p>To easily add scrollspy behavior to your topbar navigation, just add <code>data-spy="scroll"</code> to the element you want to spy on (most typically this would be the body) and <code>data-target=".navbar"</code> to select which nav to use. You'll want to use scrollspy with a <code>.nav</code> component.</p> <pre class="prettyprint linenums"><body data-spy="scroll" data-target=".navbar">...</body></pre> <h3>Via JavaScript</h3> @@ -829,7 +829,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) { <td>trigger</td> <td>string</td> <td>'hover'</td> - <td>how tooltip is triggered - hover | focus | manual</td> + <td>how tooltip is triggered - click | hover | focus | manual</td> </tr> <tr> <td>delay</td> @@ -922,7 +922,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) { <h3>Live demo</h3> <div class="bs-docs-example" style="padding-bottom: 24px;"> - <a href="#" class="btn btn-large btn-danger" rel="popover" title="A Title" data-content="And here's some amazing content. It's very engaging. right?">Hover for popover</a> + <a href="#" class="btn btn-large btn-danger" rel="popover" title="A Title" data-content="And here's some amazing content. It's very engaging. right?">Click to toggle popover</a> </div> @@ -972,8 +972,8 @@ $('a[data-toggle="tab"]').on('shown', function (e) { <tr> <td>trigger</td> <td>string</td> - <td>'hover'</td> - <td>how popover is triggered - hover | focus | manual</td> + <td>'click'</td> + <td>how popover is triggered - click | hover | focus | manual</td> </tr> <tr> <td>title</td> |