aboutsummaryrefslogtreecommitdiff
path: root/docs/javascript.html
diff options
context:
space:
mode:
authorJacob Thornton <[email protected]>2011-10-29 19:59:51 -0700
committerJacob Thornton <[email protected]>2011-10-29 19:59:51 -0700
commit169b4b5dcbca740951735a60cc5c46a1366c2652 (patch)
tree4465945e74aa8f711ef89b0b8321c895c6285aa8 /docs/javascript.html
parent640fd15464306238de99a3391888a95156e27995 (diff)
downloadbootstrap-169b4b5dcbca740951735a60cc5c46a1366c2652.tar.xz
bootstrap-169b4b5dcbca740951735a60cc5c46a1366c2652.zip
add template option and make title an optional attribute for popover
Diffstat (limited to 'docs/javascript.html')
-rw-r--r--docs/javascript.html14
1 files changed, 13 insertions, 1 deletions
diff --git a/docs/javascript.html b/docs/javascript.html
index 3aac2a82f..b80ff58fc 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -553,6 +553,12 @@ $('#.tabs').bind('change', function (e) {
<td>'hover'</td>
<td>how tooltip is triggered - hover | focus | manual</td>
</tr>
+ <tr>
+ <td>template</td>
+ <td>string</td>
+ <td>[default markup]</td>
+ <td>The html template used for rendering a twipsy.</td>
+ </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>
@@ -679,6 +685,12 @@ $('#.tabs').bind('change', function (e) {
<td>'hover'</td>
<td>how tooltip is triggered - hover | focus | manual</td>
</tr>
+ <tr>
+ <td>template</td>
+ <td>string</td>
+ <td>[default markup]</td>
+ <td>The html template used for rendering a popover.</td>
+ </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>
@@ -693,7 +705,7 @@ $('#.tabs').bind('change', function (e) {
<p>Hides an elements popover.</p>
<pre class="prettyprint linenums">$('#element').popover('hide')</pre>
<h3>Demo</h3>
- <a href="#" class="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 danger" rel="popover" title="A title" data-content="And here's some amazing content. It's very engaging. right?">hover for popover</a>
<script>
$(function () {
$("a[rel=popover]")