aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorChris Rebert <[email protected]>2015-01-15 17:15:41 -0800
committerChris Rebert <[email protected]>2015-01-15 17:18:00 -0800
commit63f31364508c1f18922867d5d66c4b84cdfb4db3 (patch)
tree7229674e56c4d26977a928b0993fea68975e8dee /docs
parentdbffb0b47f573097ec2a0500720accb6aeeab72e (diff)
downloadbootstrap-63f31364508c1f18922867d5d66c4b84cdfb4db3.tar.xz
bootstrap-63f31364508c1f18922867d5d66c4b84cdfb4db3.zip
Document that tooltip+popover show+hide methods are async; fixes #15500
[skip sauce]
Diffstat (limited to 'docs')
-rw-r--r--docs/_includes/js/popovers.html7
-rw-r--r--docs/_includes/js/tooltips.html6
2 files changed, 7 insertions, 6 deletions
diff --git a/docs/_includes/js/popovers.html b/docs/_includes/js/popovers.html
index d72c78da8..56d8ce8b1 100644
--- a/docs/_includes/js/popovers.html
+++ b/docs/_includes/js/popovers.html
@@ -252,20 +252,21 @@ sagittis lacus vel augue laoreet rutrum faucibus.">
<p>Initializes popovers for an element collection.</p>
<h4>.popover('show')</h4>
- <p>Reveals an element's popover. This is considered a "manual" triggering of the popover. Popovers whose both title and content are zero-length are never displayed.</p>
+ <p>Reveals an element's popover. <strong>Returns to the caller before the popover has actually been shown</strong> (i.e. before the <code>shown.bs.popover</code> event occurs). This is considered a "manual" triggering of the popover. Popovers whose both title and content are zero-length are never displayed.</p>
{% highlight js %}$('#element').popover('show'){% endhighlight %}
<h4>.popover('hide')</h4>
- <p>Hides an element's popover. This is considered a "manual" triggering of the popover.</p>
+ <p>Hides an element's popover. <strong>Returns to the caller before the popover has actually been hidden</strong> (i.e. before the <code>hidden.bs.popover</code> event occurs). This is considered a "manual" triggering of the popover.</p>
{% highlight js %}$('#element').popover('hide'){% endhighlight %}
<h4>.popover('toggle')</h4>
- <p>Toggles an element's popover. This is considered a "manual" triggering of the popover.</p>
+ <p>Toggles an element's popover. <strong>Returns to the caller before the popover has actually been shown or hidden</strong> (i.e. before the <code>shown.bs.popover</code> or <code>hidden.bs.popover</code> event occurs). This is considered a "manual" triggering of the popover.</p>
{% highlight js %}$('#element').popover('toggle'){% endhighlight %}
<h4>.popover('destroy')</h4>
<p>Hides and destroys an element's popover.</p>
{% highlight js %}$('#element').popover('destroy'){% endhighlight %}
+
<h3 id="popovers-events">Events</h3>
<div class="table-responsive">
<table class="table table-bordered table-striped bs-events-table">
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>