diff options
| author | Jacob Thornton <[email protected]> | 2012-03-24 18:45:12 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-03-24 18:45:12 -0700 |
| commit | 6dc59a9c3e0facab3abed7cb66d90c2316530014 (patch) | |
| tree | 81c03c3550fee6f24ba6bd84df2faa3795b23a88 /docs | |
| parent | bccc2cb7191eb54a4d67563625a748d7ecd381d4 (diff) | |
| download | bootstrap-6dc59a9c3e0facab3abed7cb66d90c2316530014.tar.xz bootstrap-6dc59a9c3e0facab3abed7cb66d90c2316530014.zip | |
add explict note that tooltip delay isn't applied to manual trigger type in popover/tooltip
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/assets/bootstrap.zip | bin | 56306 -> 56306 bytes | |||
| -rw-r--r-- | docs/javascript.html | 4 | ||||
| -rw-r--r-- | docs/templates/pages/javascript.mustache | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip Binary files differindex 594fb24db..9301d50c4 100644 --- a/docs/assets/bootstrap.zip +++ b/docs/assets/bootstrap.zip diff --git a/docs/javascript.html b/docs/javascript.html index 8728eb66d..631b7e2ec 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -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> diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache index 1c5b96d2e..e037dd024 100644 --- a/docs/templates/pages/javascript.mustache +++ b/docs/templates/pages/javascript.mustache @@ -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> |