library-mirrors/jquery-ui
1
0
Fork 0
mirror of https://github.com/jquery/jquery-ui.git synced 2024-10-05 01:44:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Tabs: Account for non-tab list items on init. Fixes #8568 - jQuery ui tabs: wrong default active li if ul contains extraneous elements.

Browse Source
This commit is contained in:
Scott González 2012-09-12 09:28:51 -04:00
parent 01e3af4b92
commit 7023ed4699
4 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/unit/tabs/tabs.html
View File

@ -145,6 +145,14 @@
</div>
</div>
<div id="tabs9">
<ul>
<li>not a tab</li>
<li><a href="#tabs9-1">tab</a></li>
</ul>
<div id="tabs9-1"></div>
</div>
</div>
</body>
</html>

9
tests/unit/tabs/tabs_core.js
View File

@ -44,6 +44,15 @@ test( "disconnected from DOM", function() {
equal( element.find( ".ui-tabs-panel" ).length, 3, "should initialize panels" );
});
test( "non-tab list items", function() {
expect( 2 );
var element = $( "#tabs9" ).tabs();
equal( element.tabs( "option", "active" ), 0, "defaults to first tab" );
equal( element.find( ".ui-tabs-nav li.ui-state-active" ).index(), 1,
"first actual tab is active" );
});
test( "aria-controls", function() {
expect( 7 );
var element = $( "#tabs1" ).tabs(),

8
tests/unit/tabs/tabs_deprecated.html
View File

@ -144,6 +144,14 @@
</div>
</div>
<div id="tabs9">
<ul>
<li>not a tab</li>
<li><a href="#tabs9-1">tab</a></li>
</ul>
<div id="tabs9-1"></div>
</div>
</div>
</body>
</html>

2
ui/jquery.ui.tabs.js vendored
View File

@ -102,7 +102,7 @@ $.widget( "ui.tabs", {
// handle numbers: negative, out of range
if ( active !== false ) {
active = this.tabs.eq( active ).index();
active = this.tabs.index( this.tabs.eq( active ) );
if ( active === -1 ) {
active = options.collapsible ? false : 0;
}