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

Author: scottgonzalez

tests/unit/tabs/tabs.html

@@ -145,6 +145,14 @@ <h2 id="qunit-userAgent"></h2>
 	</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>

tests/unit/tabs/tabs_core.js

@@ -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(),

tests/unit/tabs/tabs_deprecated.html

@@ -144,6 +144,14 @@ <h2 id="qunit-userAgent"></h2>
 	</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>

ui/jquery.ui.tabs.js

@@ -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;
 			}