mirror of
https://github.com/twbs/bootstrap.git
synced 2022-11-09 12:25:43 -05:00
remove aria-control stuff
This commit is contained in:
parent
1a8fb2dbf7
commit
b086d94253
2 changed files with 8 additions and 10 deletions
8
docs/assets/js/bootstrap-tabs.js
vendored
8
docs/assets/js/bootstrap-tabs.js
vendored
|
@ -11,17 +11,17 @@
|
|||
, $ul = $(e.liveFired)
|
||||
, $controlled
|
||||
|
||||
if (/^#/.test(href)) {
|
||||
if (/^#\w+/.test(href)) {
|
||||
e.preventDefault()
|
||||
|
||||
if ($this.hasClass('active')) {
|
||||
return
|
||||
}
|
||||
|
||||
$controlled = $('#' + $ul.attr('aria-controls'))
|
||||
$href = $(href)
|
||||
|
||||
activate($this.parent('li'), $ul)
|
||||
activate($(href, $controlled), $controlled)
|
||||
activate($href, $href.parent())
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -31,7 +31,7 @@
|
|||
|
||||
$.fn.tabs = $.fn.pills = function () {
|
||||
return this.each(function () {
|
||||
$(this).delegate('.tabs > li > a, .pills > li > a', 'click', tab)
|
||||
$(this).delegate('.tabs > li > a, .pills > li > a, .dropdown-menu > li > a', 'click', tab)
|
||||
})
|
||||
}
|
||||
|
||||
|
|
|
@ -99,8 +99,8 @@ $('#modal-content').modal({
|
|||
<!-- sample modal content -->
|
||||
<div id="modal-from-dom" class="modal hide fade">
|
||||
<div class="modal-header">
|
||||
<h3>Modal Heading</h3>
|
||||
<a href="#" class="close">×</a>
|
||||
<h3>Modal Heading</h3>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<p>One fine body…</p>
|
||||
|
@ -254,19 +254,17 @@ $('#modal-content').modal({
|
|||
<h3>Method</h3>
|
||||
<h4>$().tabs or $().pills</h4>
|
||||
<p>
|
||||
Activates tab and pill functionality for a given container.
|
||||
Activates tab and pill functionality for a given container. Tab links should reference id's in the document.
|
||||
</p>
|
||||
<p>
|
||||
<strong>Note:</strong> The controlled container is defined by a required <code>aria-controls</code> attribute added to your <code>.tabs</code> or <code>.pills</code>. The <a href="http://www.w3.org/TR/wai-aria/states_and_properties#aria-controls">aria-controls</a> attribute must reference an element's id.
|
||||
<pre class="prettyprint linenums">
|
||||
<ul class="tabs" aria-controls="my-pill-content">
|
||||
<ul class="tabs">
|
||||
<li class="active"><a href="#home">Home</a></li>
|
||||
<li><a href="#profile">Profile</a></li>
|
||||
<li><a href="#messages">Messages</a></li>
|
||||
<li><a href="#settings">Settings</a></li>
|
||||
</ul>
|
||||
|
||||
<div class="pill-content" id="my-pill-content">
|
||||
<div class="pill-content">
|
||||
<div class="active" id="home">...</div>
|
||||
<div id="profile">...</div>
|
||||
<div id="messages">...</div>
|
||||
|
|
Loading…
Reference in a new issue