Skip to content

Commit 864a18f

Browse files
committed
Merge pull request twbs#12688 from twbs/document_popover_focus
Document popover focus
2 parents 1f14842 + 0b8d27a commit 864a18f

File tree

7 files changed

+31
-7
lines changed

7 files changed

+31
-7
lines changed

dist/css/bootstrap-theme.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/bootstrap.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/assets/js/application.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,12 @@
8585
})
8686

8787
// popover demo
88-
$('[data-toggle=popover]').popover()
88+
$('.bs-docs-popover').popover()
89+
90+
// Popover dismiss on next click
91+
$('.bs-docs-popover-dismiss').popover({
92+
trigger: 'focus'
93+
})
8994

9095
// button state demo
9196
$('#loading-example-btn')

docs/assets/js/docs.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/dist/css/bootstrap-theme.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/dist/css/bootstrap.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/javascript.html

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1101,6 +1101,8 @@ <h3>Events</h3>
11011101
{% endhighlight %}
11021102
</div>
11031103

1104+
1105+
11041106
<!-- Popovers
11051107
================================================== -->
11061108
<div class="bs-docs-section">
@@ -1167,8 +1169,11 @@ <h3 class="popover-title">Popover left</h3>
11671169

11681170
<h3>Live demo</h3>
11691171
<div class="bs-example" style="padding-bottom: 24px;">
1170-
<a href="#" class="btn btn-lg btn-danger" data-toggle="popover" title="A Title" data-content="And here's some amazing content. It's very engaging. right?" role="button">Click to toggle popover</a>
1172+
<button type="button" class="btn btn-lg btn-danger bs-docs-popover" data-toggle="popover" title="Popover title" data-content="And here's some amazing content. It's very engaging. Right?">Click to toggle popover</button>
11711173
</div>
1174+
{% highlight html %}
1175+
<button type="button" class="btn btn-lg btn-danger" data-toggle="popover" title="Popover title" data-content="And here's some amazing content. It's very engaging. Right?">Click to toggle popover</button>
1176+
{% endhighlight %}
11721177

11731178
<h4>Four directions</h4>
11741179
<div class="bs-example tooltip-demo">
@@ -1204,6 +1209,20 @@ <h4>Four directions</h4>
12041209
<button type="button" class="btn btn-default" data-container="body" data-toggle="popover" data-placement="right" data-content="Vivamus sagittis lacus vel augue laoreet rutrum faucibus.">
12051210
Popover on right
12061211
</button>
1212+
{% endhighlight %}
1213+
1214+
<h4>Dismiss on next click</h4>
1215+
<p>Use the <code>focus</code> trigger to dismiss popovers on their next click.</p>
1216+
<div class="bs-example" style="padding-bottom: 24px;">
1217+
<button type="button" class="btn btn-lg btn-danger bs-docs-popover-dismiss" data-toggle="popover" title="Dimissmisable popover" data-content="And here's some amazing content. It's very engaging. Right?">Dismissable popover</button>
1218+
</div>
1219+
{% highlight html %}
1220+
<button type="button" class="btn btn-lg btn-danger popover-dismiss" data-toggle="popover" title="Dimissmisable popover" data-content="And here's some amazing content. It's very engaging. Right?">Dismissable popover</button>
1221+
{% endhighlight %}
1222+
{% highlight js %}
1223+
$('.popover-dismiss').popover({
1224+
trigger: 'focus'
1225+
})
12071226
{% endhighlight %}
12081227

12091228
<div class="bs-callout bs-callout-warning">

0 commit comments

Comments
 (0)