diff options
| author | Mark Otto <[email protected]> | 2015-01-18 12:24:29 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2015-01-18 12:24:29 -0800 |
| commit | 1bf1ba7103cf4de0364dfd8ec78a31eb813d7b8f (patch) | |
| tree | 7a63ae1a434fae8cb51835fafd1b531d5f5da64e /docs/_includes/js/tooltips.html | |
| parent | dbe47654160d389c6991a312c9cecd2eeb9b6122 (diff) | |
| parent | 22b79dae3c9307c329e6722ff1be8aa0a4143812 (diff) | |
| download | bootstrap-1bf1ba7103cf4de0364dfd8ec78a31eb813d7b8f.tar.xz bootstrap-1bf1ba7103cf4de0364dfd8ec78a31eb813d7b8f.zip | |
Merge branch 'master' into pr/15278
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/assets/js/customize.min.js
docs/assets/js/raw-files.min.js
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
Diffstat (limited to 'docs/_includes/js/tooltips.html')
| -rw-r--r-- | docs/_includes/js/tooltips.html | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/_includes/js/tooltips.html b/docs/_includes/js/tooltips.html index ae553e0df..90fa37208 100644 --- a/docs/_includes/js/tooltips.html +++ b/docs/_includes/js/tooltips.html @@ -11,7 +11,7 @@ <h3>Static tooltip</h3> <p>Four options are available: top, right, bottom, and left aligned.</p> - <div class="bs-example bs-example-tooltip"> + <div class="bs-example bs-example-tooltip" data-example-id="static-tooltips"> <div class="tooltip left" role="tooltip"> <div class="tooltip-arrow"></div> <div class="tooltip-inner"> @@ -213,15 +213,15 @@ $('#example').tooltip(options) <p>Attaches a tooltip handler to an element collection.</p> <h4>.tooltip('show')</h4> - <p>Reveals an element's tooltip. Tooltips with zero-length titles are never displayed.</p> + <p>Reveals an element's tooltip. <strong>Returns to the caller before the tooltip has actually been shown</strong> (i.e. before the <code>shown.bs.tooltip</code> event occurs). This is considered a "manual" triggering of the tooltip. Tooltips with zero-length titles are never displayed.</p> {% highlight js %}$('#element').tooltip('show'){% endhighlight %} <h4>.tooltip('hide')</h4> - <p>Hides an element's tooltip.</p> + <p>Hides an element's tooltip. <strong>Returns to the caller before the tooltip has actually been hidden</strong> (i.e. before the <code>hidden.bs.tooltip</code> event occurs). This is considered a "manual" triggering of the tooltip.</p> {% highlight js %}$('#element').tooltip('hide'){% endhighlight %} <h4>.tooltip('toggle')</h4> - <p>Toggles an element's tooltip.</p> + <p>Toggles an element's tooltip. <strong>Returns to the caller before the tooltip has actually been shown or hidden</strong> (i.e. before the <code>shown.bs.tooltip</code> or <code>hidden.bs.tooltip</code> event occurs). This is considered a "manual" triggering of the tooltip.</p> {% highlight js %}$('#element').tooltip('toggle'){% endhighlight %} <h4>.tooltip('destroy')</h4> |