From d2b919143c3fdb736ba7efae6bfb34937993db71 Mon Sep 17 00:00:00 2001
From: Sid <sidp@knights.ucf.edu>
Date: Fri, 24 Mar 2017 06:32:39 -0400
Subject: Add missing v4 docs for tooltip/popover methods (#22246)

Add missing v4 docs for tooltip/popover methods
---
 docs/components/tooltips.md | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'docs/components/tooltips.md')

diff --git a/docs/components/tooltips.md b/docs/components/tooltips.md
index 825782ac2..eaab24da5 100644
--- a/docs/components/tooltips.md
+++ b/docs/components/tooltips.md
@@ -282,6 +282,24 @@ Hides and destroys an element's tooltip. Tooltips that use delegation (which are
 
 {% highlight js %}$('#element').tooltip('dispose'){% endhighlight %}
 
+#### `.tooltip('enable')`
+
+Gives an element's tooltip the ability to be shown. **Tooltips are enabled by default.**
+
+{% highlight js %}$('#element').tooltip('enable'){% endhighlight %}
+
+#### `.tooltip('disable')`
+
+Removes the ability for an element's tooltip to be shown. The tooltip will only be able to be shown if it is re-enabled.
+
+{% highlight js %}$('#element').tooltip('disable'){% endhighlight %}
+
+#### `.tooltip('toggleEnabled')`
+
+Toggles the ability for an element's tooltip to be shown or hidden.
+
+{% highlight js %}$('#element').tooltip('toggleEnabled'){% endhighlight %}
+
 ### Events
 
 <table class="table table-bordered table-striped table-responsive">
-- 
cgit v1.2.3


From 48c5efa4c3c439d8720b8475ec3e372c6974a12a Mon Sep 17 00:00:00 2001
From: Pierre Vanduynslager <pierre.denis.vanduynslager@gmail.com>
Date: Tue, 28 Mar 2017 17:43:16 -0400
Subject: Fix JS components console error "Error: <Component> is transitioning"

---
 docs/components/tooltips.md | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'docs/components/tooltips.md')

diff --git a/docs/components/tooltips.md b/docs/components/tooltips.md
index eaab24da5..a8b251c09 100644
--- a/docs/components/tooltips.md
+++ b/docs/components/tooltips.md
@@ -254,6 +254,9 @@ Options for individual tooltips can alternatively be specified through the use o
 
 ### Methods
 
+{% capture callout-include %}{% include callout-danger-async-methods.md %}{% endcapture %}
+{{ callout-include | markdownify }}
+
 #### `$().tooltip(options)`
 
 Attaches a tooltip handler to an element collection.
-- 
cgit v1.2.3


From 31a21044e021a591d0e9d6eba9ee17d2000e17ac Mon Sep 17 00:00:00 2001
From: Johann-S <johann.servoire@gmail.com>
Date: Fri, 7 Apr 2017 14:23:26 +0200
Subject: Documentation - Add inserted event for Tooltip and Popover

---
 docs/components/tooltips.md | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'docs/components/tooltips.md')

diff --git a/docs/components/tooltips.md b/docs/components/tooltips.md
index a8b251c09..7c7f9af8b 100644
--- a/docs/components/tooltips.md
+++ b/docs/components/tooltips.md
@@ -329,6 +329,10 @@ Toggles the ability for an element's tooltip to be shown or hidden.
       <td>hidden.bs.tooltip</td>
       <td>This event is fired when the tooltip has finished being hidden from the user (will wait for CSS transitions to complete).</td>
     </tr>
+    <tr>
+      <td>inserted.bs.tooltip</td>
+      <td>This event is fired after the <code>show.bs.tooltip</code> event when the tooltip template has been added to the DOM.</td>
+    </tr>
   </tbody>
 </table>
 
-- 
cgit v1.2.3