aboutsummaryrefslogtreecommitdiff
path: root/docs/javascript.html
diff options
context:
space:
mode:
authorJacob Thornton <[email protected]>2012-03-24 18:45:12 -0700
committerJacob Thornton <[email protected]>2012-03-24 18:45:12 -0700
commit6dc59a9c3e0facab3abed7cb66d90c2316530014 (patch)
tree81c03c3550fee6f24ba6bd84df2faa3795b23a88 /docs/javascript.html
parentbccc2cb7191eb54a4d67563625a748d7ecd381d4 (diff)
downloadbootstrap-6dc59a9c3e0facab3abed7cb66d90c2316530014.tar.xz
bootstrap-6dc59a9c3e0facab3abed7cb66d90c2316530014.zip
add explict note that tooltip delay isn't applied to manual trigger type in popover/tooltip
Diffstat (limited to 'docs/javascript.html')
-rw-r--r--docs/javascript.html4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/javascript.html b/docs/javascript.html
index 8728eb66d..631b7e2ec 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -797,7 +797,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
<td>number | object</td>
<td>0</td>
<td>
- <p>delay showing and hiding the tooltip (ms)</p>
+ <p>delay showing and hiding the tooltip (ms) - does not apply to manual trigger type</p>
<p>If a number is supplied, delay is applied to both hide/show</p>
<p>Object structure is: <code>delay: { show: 500, hide: 100 }</code></p>
</td>
@@ -906,7 +906,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
<td>number | object</td>
<td>0</td>
<td>
- <p>delay showing and hiding the popover (ms)</p>
+ <p>delay showing and hiding the popover (ms) - does not apply to manual trigger type</p>
<p>If a number is supplied, delay is applied to both hide/show</p>
<p>Object structure is: <code>delay: { show: 500, hide: 100 }</code></p>
</td>