From fb6622a7d44c99323bea5bd69cb0604470bbe21a Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Tue, 13 Jan 2015 17:06:31 -0800 Subject: [PATCH] Document that calling tooltip/popover .show()/.hide() qualifies as manual triggering Fixes #15465 [skip sauce] --- docs/_includes/js/popovers.html | 6 +++--- docs/_includes/js/tooltips.html | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/_includes/js/popovers.html b/docs/_includes/js/popovers.html index 321c93d9bd..d72c78da8b 100644 --- a/docs/_includes/js/popovers.html +++ b/docs/_includes/js/popovers.html @@ -252,15 +252,15 @@ sagittis lacus vel augue laoreet rutrum faucibus.">

Initializes popovers for an element collection.

.popover('show')

-

Reveals an element's popover. Popovers whose both title and content are zero-length are never displayed.

+

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.

{% highlight js %}$('#element').popover('show'){% endhighlight %}

.popover('hide')

-

Hides an element's popover.

+

Hides an element's popover. This is considered a "manual" triggering of the popover.

{% highlight js %}$('#element').popover('hide'){% endhighlight %}

.popover('toggle')

-

Toggles an element's popover.

+

Toggles an element's popover. This is considered a "manual" triggering of the popover.

{% highlight js %}$('#element').popover('toggle'){% endhighlight %}

.popover('destroy')

diff --git a/docs/_includes/js/tooltips.html b/docs/_includes/js/tooltips.html index fd6cc445dd..0cf91bfb54 100644 --- a/docs/_includes/js/tooltips.html +++ b/docs/_includes/js/tooltips.html @@ -213,15 +213,15 @@ $('#example').tooltip(options)

Attaches a tooltip handler to an element collection.

.tooltip('show')

-

Reveals an element's tooltip. Tooltips with zero-length titles are never displayed.

+

Reveals an element's tooltip. This is considered a "manual" triggering of the tooltip. Tooltips with zero-length titles are never displayed.

{% highlight js %}$('#element').tooltip('show'){% endhighlight %}

.tooltip('hide')

-

Hides an element's tooltip.

+

Hides an element's tooltip. This is considered a "manual" triggering of the tooltip.

{% highlight js %}$('#element').tooltip('hide'){% endhighlight %}

.tooltip('toggle')

-

Toggles an element's tooltip.

+

Toggles an element's tooltip. This is considered a "manual" triggering of the tooltip.

{% highlight js %}$('#element').tooltip('toggle'){% endhighlight %}

.tooltip('destroy')