diff options
| author | Chris Rebert <[email protected]> | 2014-07-03 11:07:50 -0700 |
|---|---|---|
| committer | Chris Rebert <[email protected]> | 2014-07-03 11:07:50 -0700 |
| commit | 456bd67da84fcdcdffa7f2124673812db0552ba8 (patch) | |
| tree | 9169b99ad10ff3cbf8cb1d07cffcebd60411e122 | |
| parent | 9875ce8d633425365fa24e607c4080598cec1c2c (diff) | |
| parent | 48e35cb83010915aafaa8ee1fe7e9b5eb54045d8 (diff) | |
| download | bootstrap-456bd67da84fcdcdffa7f2124673812db0552ba8.tar.xz bootstrap-456bd67da84fcdcdffa7f2124673812db0552ba8.zip | |
Merge pull request #13986 from twbs/address-13874
docs: use valid JSON in compound option value examples
| -rw-r--r-- | docs/_includes/js/popovers.html | 4 | ||||
| -rw-r--r-- | docs/_includes/js/tooltips.html | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/docs/_includes/js/popovers.html b/docs/_includes/js/popovers.html index 3f5702b49..ef8e07941 100644 --- a/docs/_includes/js/popovers.html +++ b/docs/_includes/js/popovers.html @@ -175,7 +175,7 @@ $('.popover-dismiss').popover({ <td> <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> + <p>Object structure is: <code>delay: { "show": 500, "hide": 100 }</code></p> </td> </tr> <tr> @@ -225,7 +225,7 @@ $('.popover-dismiss').popover({ <td>string | object</td> <td>{ selector: 'body', padding: 0 }</td> <td> - <p>Keeps the popover within the bounds of this element. Example: <code>viewport: '#viewport'</code> or <code>{ selector: '#viewport', padding: 0 }</code></p> + <p>Keeps the popover within the bounds of this element. Example: <code>viewport: '#viewport'</code> or <code>{ "selector": "#viewport", "padding": 0 }</code></p> </td> </tr> </tbody> diff --git a/docs/_includes/js/tooltips.html b/docs/_includes/js/tooltips.html index 858a91ec3..fac4f6519 100644 --- a/docs/_includes/js/tooltips.html +++ b/docs/_includes/js/tooltips.html @@ -105,7 +105,7 @@ $('#example').tooltip(options) <td> <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> + <p>Object structure is: <code>delay: { "show": 500, "hide": 100 }</code></p> </td> </tr> <tr> @@ -154,7 +154,7 @@ $('#example').tooltip(options) <td>string | object</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>Keeps the tooltip within the bounds of this element. Example: <code>viewport: '#viewport'</code> or <code>{ "selector": "#viewport", "padding": 0 }</code></p> </td> </tr> </tbody> |