rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-29 11:24:18 +01:00
Code Issues Actions Packages Releases Activity

Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip

Browse Source
This commit is contained in:
Mark Otto 2011-09-09 00:03:01 -07:00
commit df3ca4d94a
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docs/assets/js/bootstrap-tabs.js vendored
View File

@ -11,17 +11,17 @@
, $ul = $(e.liveFired) , $ul = $(e.liveFired)
, $controlled , $controlled
if (/^#/.test(href)) { if (/^#\w+/.test(href)) {
e.preventDefault() e.preventDefault()
if ($this.hasClass('active')) { if ($this.hasClass('active')) {
return return
} }
$controlled = $('#' + $ul.attr('aria-controls')) $href = $(href)
activate($this.parent('li'), $ul) activate($this.parent('li'), $ul)
activate($(href, $controlled), $controlled) activate($href, $href.parent())
} }
} }
@ -31,7 +31,7 @@
$.fn.tabs = $.fn.pills = function () { $.fn.tabs = $.fn.pills = function () {
return this.each(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)
}) })
} }

10
docs/javascript.html
View File

@ -99,8 +99,8 @@ $('#modal-content').modal({
<!-- sample modal content --> <!-- sample modal content -->
<div id="modal-from-dom" class="modal hide fade"> <div id="modal-from-dom" class="modal hide fade">
<div class="modal-header"> <div class="modal-header">
<h3>Modal Heading</h3>
<a href="#" class="close">&times;</a> <a href="#" class="close">&times;</a>
<h3>Modal Heading</h3>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<p>One fine body…</p> <p>One fine body…</p>
@ -254,19 +254,17 @@ $('#modal-content').modal({
<h3>Method</h3> <h3>Method</h3>
<h4>$().tabs or $().pills</h4> <h4>$().tabs or $().pills</h4>
<p> <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>
<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"> <pre class="prettyprint linenums">
&lt;ul class="tabs" aria-controls="my-pill-content"&gt; &lt;ul class="tabs"&gt;
&lt;li class="active"&gt;&lt;a href="#home"&gt;Home&lt;/a&gt;&lt;/li&gt; &lt;li class="active"&gt;&lt;a href="#home"&gt;Home&lt;/a&gt;&lt;/li&gt;
&lt;li&gt;&lt;a href="#profile"&gt;Profile&lt;/a&gt;&lt;/li&gt; &lt;li&gt;&lt;a href="#profile"&gt;Profile&lt;/a&gt;&lt;/li&gt;
&lt;li&gt;&lt;a href="#messages"&gt;Messages&lt;/a&gt;&lt;/li&gt; &lt;li&gt;&lt;a href="#messages"&gt;Messages&lt;/a&gt;&lt;/li&gt;
&lt;li&gt;&lt;a href="#settings"&gt;Settings&lt;/a&gt;&lt;/li&gt; &lt;li&gt;&lt;a href="#settings"&gt;Settings&lt;/a&gt;&lt;/li&gt;
&lt;/ul&gt; &lt;/ul&gt;
&lt;div class="pill-content" id="my-pill-content"&gt; &lt;div class="pill-content"&gt;
&lt;div class="active" id="home"&gt;...&lt;/div&gt; &lt;div class="active" id="home"&gt;...&lt;/div&gt;
&lt;div id="profile"&gt;...&lt;/div&gt; &lt;div id="profile"&gt;...&lt;/div&gt;
&lt;div id="messages"&gt;...&lt;/div&gt; &lt;div id="messages"&gt;...&lt;/div&gt;