aboutsummaryrefslogtreecommitdiff
path: root/docs/javascript.html
diff options
context:
space:
mode:
authorfat <[email protected]>2012-12-22 13:24:37 -0800
committerfat <[email protected]>2012-12-22 13:24:37 -0800
commitfad0fb683bdcc71f5ffc9c18300dd19427b588ae (patch)
treec0db6c6bb38e13ec266475b74dc67d1fc0c0b71c /docs/javascript.html
parente2434fefbd9d68e79d4ecae1f41b018b2c1d4199 (diff)
downloadbootstrap-fad0fb683bdcc71f5ffc9c18300dd19427b588ae.tar.xz
bootstrap-fad0fb683bdcc71f5ffc9c18300dd19427b588ae.zip
allow multiple trigger types in tooltip and popover + default tooltip to hover & focus
Diffstat (limited to 'docs/javascript.html')
-rw-r--r--docs/javascript.html4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/javascript.html b/docs/javascript.html
index ac617a6b8..43e495f93 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -836,8 +836,8 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
<tr>
<td>trigger</td>
<td>string</td>
- <td>'hover'</td>
- <td>how tooltip is triggered - click | hover | focus | manual</td>
+ <td>'hover focus'</td>
+ <td>how tooltip is triggered - click | hover | focus | manual. Note, you case pass trigger mutliple, space seperated, trigger types.</td>
</tr>
<tr>
<td>delay</td>