]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Document that 'manual' is mutually exclusive of other tooltip/popover triggers 16411/head
authorChris Rebert <code@rebertia.com>
Sun, 3 May 2015 01:20:59 +0000 (18:20 -0700)
committerChris Rebert <code@rebertia.com>
Sun, 3 May 2015 01:24:12 +0000 (18:24 -0700)
Closes #16122
[skip sauce]

docs/_includes/js/popovers.html
docs/_includes/js/tooltips.html

index a782a12047521bd3fddee562617990c7c6f0f0e6..9e2532733f2cf45045811bd53a4278a954c6f71d 100644 (file)
@@ -229,7 +229,7 @@ sagittis lacus vel augue laoreet rutrum faucibus.">
           <td>trigger</td>
           <td>string</td>
           <td>'click'</td>
-          <td>How popover is triggered - click | hover | focus | manual. You may pass multiple triggers; separate them with a space.</td>
+          <td>How popover is triggered - click | hover | focus | manual. You may pass multiple triggers; separate them with a space. <code>manual</code> cannot be combined with any other trigger.</td>
         </tr>
         <tr>
           <td>viewport</td>
index 5b399a5f38d23391dca6a4f71b91497af8a30a7a..991c0c9c94c42430df06e35af16bb0aea82b1545 100644 (file)
@@ -195,7 +195,7 @@ $('#example').tooltip(options)
           <td>trigger</td>
           <td>string</td>
           <td>'hover focus'</td>
-          <td>How tooltip is triggered - click | hover | focus | manual. You may pass multiple triggers; separate them with a space.</td>
+          <td>How tooltip is triggered - click | hover | focus | manual. You may pass multiple triggers; separate them with a space. <code>manual</code> cannot be combined with any other trigger.</td>
         </tr>
         <tr>
           <td>viewport</td>