]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
add explict note that tooltip delay isn't applied to manual trigger type in popover...
authorJacob Thornton <jacobthornton@gmail.com>
Sun, 25 Mar 2012 01:45:12 +0000 (18:45 -0700)
committerJacob Thornton <jacobthornton@gmail.com>
Sun, 25 Mar 2012 01:45:12 +0000 (18:45 -0700)
docs/assets/bootstrap.zip
docs/javascript.html
docs/templates/pages/javascript.mustache

index 594fb24db8cf2d9287ba4f0559891cbf0e78c526..9301d50c45b137398563ecac676c459e69c90ecb 100644 (file)
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
index 8728eb66dfefabbdff300359f90d0b9c645c703f..631b7e2ecafeeea0c3f66c1438ed2328c9f7b0fe 100644 (file)
@@ -797,7 +797,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
                <td>number | object</td>
                <td>0</td>
                <td>
-                <p>delay showing and hiding the tooltip (ms)</p>
+                <p>delay showing and hiding the tooltip (ms) - does not apply to manual trigger type</p>
                 <p>If a number is supplied, delay is applied to both hide/show</p>
                 <p>Object structure is: <code>delay: { show: 500, hide: 100 }</code></p>
                </td>
@@ -906,7 +906,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
                <td>number | object</td>
                <td>0</td>
                <td>
-                <p>delay showing and hiding the popover (ms)</p>
+                <p>delay showing and hiding the popover (ms) - does not apply to manual trigger type</p>
                 <p>If a number is supplied, delay is applied to both hide/show</p>
                 <p>Object structure is: <code>delay: { show: 500, hide: 100 }</code></p>
                </td>
index 1c5b96d2e64d3100b5aaa169c8c342509e73675d..e037dd0243c7252b26c2d70e602201777f9d4ccb 100644 (file)
@@ -721,7 +721,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
                <td>{{_i}}number | object{{/i}}</td>
                <td>0</td>
                <td>
-                <p>{{_i}}delay showing and hiding the tooltip (ms){{/i}}</p>
+                <p>{{_i}}delay showing and hiding the tooltip (ms) - does not apply to manual trigger type{{/i}}</p>
                 <p>{{_i}}If a number is supplied, delay is applied to both hide/show{{/i}}</p>
                 <p>{{_i}}Object structure is: <code>delay: { show: 500, hide: 100 }</code>{{/i}}</p>
                </td>
@@ -830,7 +830,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
                <td>{{_i}}number | object{{/i}}</td>
                <td>0</td>
                <td>
-                <p>{{_i}}delay showing and hiding the popover (ms){{/i}}</p>
+                <p>{{_i}}delay showing and hiding the popover (ms) - does not apply to manual trigger type{{/i}}</p>
                 <p>{{_i}}If a number is supplied, delay is applied to both hide/show{{/i}}</p>
                 <p>{{_i}}Object structure is: <code>delay: { show: 500, hide: 100 }</code>{{/i}}</p>
                </td>