From 3d71eae3011b10daa558baf494b019925fee5f60 Mon Sep 17 00:00:00 2001
From: Johann-S <johann.servoire@gmail.com>
Date: Tue, 24 Mar 2015 20:47:35 +0100
Subject: Add event after template inserted

---
 docs/_includes/js/tooltips.html | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'docs/_includes/js/tooltips.html')

diff --git a/docs/_includes/js/tooltips.html b/docs/_includes/js/tooltips.html
index d606929ba..a8914b180 100644
--- a/docs/_includes/js/tooltips.html
+++ b/docs/_includes/js/tooltips.html
@@ -260,6 +260,10 @@ $('#example').tooltip(options)
           <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>
   </div><!-- /.table-responsive -->
-- 
cgit v1.2.3


From e949505b89ca146e3af0cf735e100c82703f1cda Mon Sep 17 00:00:00 2001
From: Adrien Siami <adrien.siami@dimelo.com>
Date: Wed, 25 Mar 2015 14:46:21 +0100
Subject: Allow viewport option to be a function

Closes #16151 by merging a rebased version of it that adds docs and 1 more assertion.
---
 docs/_includes/js/tooltips.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'docs/_includes/js/tooltips.html')

diff --git a/docs/_includes/js/tooltips.html b/docs/_includes/js/tooltips.html
index a8914b180..5b399a5f3 100644
--- a/docs/_includes/js/tooltips.html
+++ b/docs/_includes/js/tooltips.html
@@ -199,10 +199,11 @@ $('#example').tooltip(options)
         </tr>
         <tr>
           <td>viewport</td>
-          <td>string | object</td>
+          <td>string | object | function</td>
           <td>{ selector: 'body', padding: 0 }</td>
           <td>
             <p>Keeps the tooltip within the bounds of this element. Example: <code>viewport: '#viewport'</code> or <code>{ "selector": "#viewport", "padding": 0 }</code></p>
+            <p>If a function is given, it is called with the triggering element DOM node as its only argument. The <code>this</code> context is set to the tooltip instance.</p>
           </td>
         </tr>
       </tbody>
-- 
cgit v1.2.3