aboutsummaryrefslogtreecommitdiff
path: root/docs/javascript.html
diff options
context:
space:
mode:
authorJacob Thornton <[email protected]>2011-10-29 19:27:02 -0700
committerJacob Thornton <[email protected]>2011-10-29 19:27:02 -0700
commit640fd15464306238de99a3391888a95156e27995 (patch)
tree83c14ea7a106bf3ee26a7777c18c33ce01b92ce0 /docs/javascript.html
parentea50e8aeeed6616a61a7e44d28fe60ced327be0c (diff)
downloadbootstrap-640fd15464306238de99a3391888a95156e27995.tar.xz
bootstrap-640fd15464306238de99a3391888a95156e27995.zip
allow the use of data attributes to define popover options
Diffstat (limited to 'docs/javascript.html')
-rw-r--r--docs/javascript.html6
1 files changed, 5 insertions, 1 deletions
diff --git a/docs/javascript.html b/docs/javascript.html
index 47edf2b75..3aac2a82f 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -555,6 +555,8 @@ $('#.tabs').bind('change', function (e) {
</tr>
</tbody>
</table>
+ <p><span class="label notice">Notice</span> Individual twipsy instance options can alternatively be specified through the use of data attributes.</code></p>
+ <pre class="prettyprint linenums">&lt;a href="#" data-placement="below" rel='twipsy' title='Some title text'&gt;text&lt;/a&gt;</pre>
<h3>Methods</h3>
<h4>$().twipsy(options)</h4>
<p>Attaches a twipsy handler to an element collection.</p>
@@ -669,7 +671,7 @@ $('#.tabs').bind('change', function (e) {
<td>content</td>
<td>string, function</td>
<td>'data-content'</td>
- <td>attribute or method for retrieving content text</td>
+ <td>a string or method for retrieving content text. if none are provided, content will be sourced from a data-content attribute.</td>
</tr>
<tr>
<td>trigger</td>
@@ -679,6 +681,8 @@ $('#.tabs').bind('change', function (e) {
</tr>
</tbody>
</table>
+ <p><span class="label notice">Notice</span> Individual popover instance options can alternatively be specified through the use of data attributes.</code></p>
+ <pre class="prettyprint linenums">&lt;a data-placement="below" href="#" class="btn danger" rel="popover"&gt;text&lt;/a&gt;</pre>
<h3>Methods</h3>
<h4>$().popover(options)</h4>
<p>Initializes popovers for an element collection.</p>