Skip to content

Commit

Permalink
Tabs: Ignore sublists. Fixes #5893 - Tabs: ability to contain sublists.
Browse files Browse the repository at this point in the history
  • Loading branch information
ph-ausseil authored and scottgonzalez committed Aug 12, 2010
1 parent 2398f6d commit 03eea0e
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 1 deletion.
13 changes: 13 additions & 0 deletions tests/unit/tabs/tabs.html
Expand Up @@ -93,6 +93,19 @@ <h2 id="qunit-userAgent"></h2>
<ul id="tabs5-list"></ul>
</div>
</div>
<div id="tabs6">
<ul id="tabs6-list">
<li><a href="#tabs6-1">1</a>
<ul>
<li><a href="#item6-3">3</a></li>
<li><a href="#item6-4">4</a></li>
</ul>
</li>
<li><a href="#tabs6-2">2</a></li>
</ul>
<div id="tabs6-1"></div>
<div id="tabs6-2"></div>
</div>
</div>
</body>
</html>
10 changes: 10 additions & 0 deletions tests/unit/tabs/tabs_tickets.js
Expand Up @@ -71,4 +71,14 @@ test('#5069 - ui.tabs.add creates two tab panels when using a full URL', functio
});


test('#5893 - Sublist in the tab list are considered as tab', function() {
// http://dev.jqueryui.com/ticket/5893
expect(1);

el = $('#tabs6').tabs();
equals(el.tabs( "length" ), 2, 'should contain 2 tab');

});


})(jQuery);
2 changes: 1 addition & 1 deletion ui/jquery.ui.tabs.js
Expand Up @@ -103,7 +103,7 @@ $.widget( "ui.tabs", {
fragmentId = /^#.+/; // Safari 2 reports '#' for an empty hash

this.list = this.element.find( "ol,ul" ).eq( 0 );
this.lis = $( "li:has(a[href])", this.list );
this.lis = $( " > li:has(a[href])", this.list );
this.anchors = this.lis.map(function() {
return $( "a", this )[ 0 ];
});
Expand Down

1 comment on commit 03eea0e

@scottgonzalez
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ph-ausseil Can you please sign our CLA?

Please sign in to comment.