diff options
| author | Mark Otto <[email protected]> | 2012-02-12 13:27:29 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-02-12 13:27:29 -0800 |
| commit | de6f3d4a6f3c2c55394e59e0a25ea85731166cfe (patch) | |
| tree | e3e7dd6836f39a75ec99526a062510357c547a0b /docs/javascript.html | |
| parent | ebe547b6a0c4ab8c546221db0731104c464920b3 (diff) | |
| parent | 5b4a29d84e6290a93db98da34b89776a9740e455 (diff) | |
| download | bootstrap-de6f3d4a6f3c2c55394e59e0a25ea85731166cfe.tar.xz bootstrap-de6f3d4a6f3c2c55394e59e0a25ea85731166cfe.zip | |
Merge branch '2.0.1-wip' of github.com:twitter/bootstrap into 2.0.1-wip
Conflicts:
docs/assets/bootstrap.zip
Diffstat (limited to 'docs/javascript.html')
| -rw-r--r-- | docs/javascript.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/javascript.html b/docs/javascript.html index 855cd82bc..f5563ac53 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -733,7 +733,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) { </tr> <tr> <td>placement</td> - <td>string</td> + <td>string|function</td> <td>'top'</td> <td>how to position the tooltip - top | bottom | left | right</td> </tr> @@ -836,7 +836,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) { </tr> <tr> <td>placement</td> - <td>string</td> + <td>string|function</td> <td>'right'</td> <td>how to position the popover - top | bottom | left | right</td> </tr> |