diff options
| author | Mark Otto <[email protected]> | 2013-01-14 00:33:16 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-01-14 00:33:16 -0800 |
| commit | 337741fc9aa89e691f15c45d59cd4b70e4b16527 (patch) | |
| tree | 2719f8abd9da1bf5cbe3cbb98dafe7f270d10e64 | |
| parent | f9ee99cf6febd0b59ee95aa1866a3c1eb5c61320 (diff) | |
| parent | 5ae1df617fc7ac95dc6b530280d1e66355ecbc4d (diff) | |
| download | bootstrap-337741fc9aa89e691f15c45d59cd4b70e4b16527.tar.xz bootstrap-337741fc9aa89e691f15c45d59cd4b70e4b16527.zip | |
Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
| -rw-r--r-- | docs/javascript.html | 8 | ||||
| -rw-r--r-- | docs/templates/pages/javascript.mustache | 8 |
2 files changed, 16 insertions, 0 deletions
diff --git a/docs/javascript.html b/docs/javascript.html index 98a17ab1f..896a9e8bf 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -1023,6 +1023,14 @@ $('a[data-toggle="tab"]').on('shown', function (e) { <p>Object structure is: <code>delay: { show: 500, hide: 100 }</code></p> </td> </tr> + <tr> + <td>container</td> + <td>string | false</td> + <td>false</td> + <td> + <p>Appends the popover to a specific element <code>container: 'body'</code></p> + </td> + </tr> </tbody> </table> <div class="alert alert-info"> diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache index 6e361fa60..9a08a50b3 100644 --- a/docs/templates/pages/javascript.mustache +++ b/docs/templates/pages/javascript.mustache @@ -953,6 +953,14 @@ $('a[data-toggle="tab"]').on('shown', function (e) { <p>{{_i}}Object structure is: <code>delay: { show: 500, hide: 100 }</code>{{/i}}</p> </td> </tr> + <tr> + <td>{{_i}}container{{/i}}</td> + <td>{{_i}}string | false{{/i}}</td> + <td>{{_i}}false{{/i}}</td> + <td> + <p>{{_i}}Appends the popover to a specific element <code>container: 'body'</code>{{/i}}</p> + </td> + </tr> </tbody> </table> <div class="alert alert-info"> |