diff options
| author | Chris Rebert <[email protected]> | 2014-07-28 13:53:48 -0700 |
|---|---|---|
| committer | Chris Rebert <[email protected]> | 2014-07-28 13:53:48 -0700 |
| commit | 86d698f4e4482f3f2a4cc614a3217dbf5380fa74 (patch) | |
| tree | f49c61c24fac48da6bf9f09867c33ed9f643f778 | |
| parent | 29731035716783087d6b96f67f519967fae46a2a (diff) | |
| parent | ff12a76e5aee26fda3452f88987c7d0d0c2c646a (diff) | |
| download | bootstrap-86d698f4e4482f3f2a4cc614a3217dbf5380fa74.tar.xz bootstrap-86d698f4e4482f3f2a4cc614a3217dbf5380fa74.zip | |
Merge pull request #14256 from twbs/fix-14224
Correctly doc args passed to function vals for `title` & `content` options of tooltips+popovers
| -rw-r--r-- | docs/_includes/js/popovers.html | 7 | ||||
| -rw-r--r-- | docs/_includes/js/tooltips.html | 5 |
2 files changed, 9 insertions, 3 deletions
diff --git a/docs/_includes/js/popovers.html b/docs/_includes/js/popovers.html index ab3d9fea0..110bc3715 100644 --- a/docs/_includes/js/popovers.html +++ b/docs/_includes/js/popovers.html @@ -164,7 +164,7 @@ sagittis lacus vel augue laoreet rutrum faucibus."> <td>''</td> <td> <p>Default content value if <code>data-content</code> attribute isn't present.</p> - <p>If a function is given, it will be called with 1 argument, which is the element that the popover is attached to.</p> + <p>If a function is given, it will be called with its <code>this</code> reference set to the element that the popover is attached to.</p> </td> </tr> <tr> @@ -211,7 +211,10 @@ sagittis lacus vel augue laoreet rutrum faucibus."> <td>title</td> <td>string | function</td> <td>''</td> - <td>Default title value if <code>title</code> attribute isn't present</td> + <td> + <p>Default title value if <code>title</code> attribute isn't present.</p> + <p>If a function is given, it will be called with its <code>this</code> reference set to the element that the popover is attached to.</p> + </td> </tr> <tr> <td>trigger</td> diff --git a/docs/_includes/js/tooltips.html b/docs/_includes/js/tooltips.html index 80e0ce714..0b3ab57d0 100644 --- a/docs/_includes/js/tooltips.html +++ b/docs/_includes/js/tooltips.html @@ -142,7 +142,10 @@ $('#example').tooltip(options) <td>title</td> <td>string | function</td> <td>''</td> - <td>Default title value if <code>title</code> attribute isn't present</td> + <td> + <p>Default title value if <code>title</code> attribute isn't present.</p> + <p>If a function is given, it will be called with its <code>this</code> reference set to the element that the tooltip is attached to.</p> + </td> </tr> <tr> <td>trigger</td> |