diff options
| author | Chris Rebert <[email protected]> | 2015-01-15 17:22:14 -0800 |
|---|---|---|
| committer | Chris Rebert <[email protected]> | 2015-01-15 17:22:14 -0800 |
| commit | cd31bef5ce5b6ea3d7c5622b7b9c8fb0918c6a61 (patch) | |
| tree | 7229674e56c4d26977a928b0993fea68975e8dee /docs/_includes/js/tooltips.html | |
| parent | dbffb0b47f573097ec2a0500720accb6aeeab72e (diff) | |
| parent | 63f31364508c1f18922867d5d66c4b84cdfb4db3 (diff) | |
| download | bootstrap-cd31bef5ce5b6ea3d7c5622b7b9c8fb0918c6a61.tar.xz bootstrap-cd31bef5ce5b6ea3d7c5622b7b9c8fb0918c6a61.zip | |
Merge pull request #15580 from twbs/tooltip-async-docs
Document that tooltip+popover show+hide methods are async
Diffstat (limited to 'docs/_includes/js/tooltips.html')
| -rw-r--r-- | docs/_includes/js/tooltips.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/_includes/js/tooltips.html b/docs/_includes/js/tooltips.html index 0cf91bfb5..90fa37208 100644 --- a/docs/_includes/js/tooltips.html +++ b/docs/_includes/js/tooltips.html @@ -213,15 +213,15 @@ $('#example').tooltip(options) <p>Attaches a tooltip handler to an element collection.</p> <h4>.tooltip('show')</h4> - <p>Reveals an element's tooltip. This is considered a "manual" triggering of the tooltip. Tooltips with zero-length titles are never displayed.</p> + <p>Reveals an element's tooltip. <strong>Returns to the caller before the tooltip has actually been shown</strong> (i.e. before the <code>shown.bs.tooltip</code> event occurs). This is considered a "manual" triggering of the tooltip. Tooltips with zero-length titles are never displayed.</p> {% highlight js %}$('#element').tooltip('show'){% endhighlight %} <h4>.tooltip('hide')</h4> - <p>Hides an element's tooltip. This is considered a "manual" triggering of the tooltip.</p> + <p>Hides an element's tooltip. <strong>Returns to the caller before the tooltip has actually been hidden</strong> (i.e. before the <code>hidden.bs.tooltip</code> event occurs). This is considered a "manual" triggering of the tooltip.</p> {% highlight js %}$('#element').tooltip('hide'){% endhighlight %} <h4>.tooltip('toggle')</h4> - <p>Toggles an element's tooltip. This is considered a "manual" triggering of the tooltip.</p> + <p>Toggles an element's tooltip. <strong>Returns to the caller before the tooltip has actually been shown or hidden</strong> (i.e. before the <code>shown.bs.tooltip</code> or <code>hidden.bs.tooltip</code> event occurs). This is considered a "manual" triggering of the tooltip.</p> {% highlight js %}$('#element').tooltip('toggle'){% endhighlight %} <h4>.tooltip('destroy')</h4> |