Skip to content

Commit 03eea0e

Browse files
ph-ausseilscottgonzalez
authored andcommitted
Tabs: Ignore sublists. Fixes #5893 - Tabs: ability to contain sublists.
1 parent 2398f6d commit 03eea0e

File tree

3 files changed

+24
-1
lines changed

3 files changed

+24
-1
lines changed

tests/unit/tabs/tabs.html

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,19 @@ <h2 id="qunit-userAgent"></h2>
9393
<ul id="tabs5-list"></ul>
9494
</div>
9595
</div>
96+
<div id="tabs6">
97+
<ul id="tabs6-list">
98+
<li><a href="#tabs6-1">1</a>
99+
<ul>
100+
<li><a href="#item6-3">3</a></li>
101+
<li><a href="#item6-4">4</a></li>
102+
</ul>
103+
</li>
104+
<li><a href="#tabs6-2">2</a></li>
105+
</ul>
106+
<div id="tabs6-1"></div>
107+
<div id="tabs6-2"></div>
108+
</div>
96109
</div>
97110
</body>
98111
</html>

tests/unit/tabs/tabs_tickets.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,4 +71,14 @@ test('#5069 - ui.tabs.add creates two tab panels when using a full URL', functio
7171
});
7272

7373

74+
test('#5893 - Sublist in the tab list are considered as tab', function() {
75+
// http://dev.jqueryui.com/ticket/5893
76+
expect(1);
77+
78+
el = $('#tabs6').tabs();
79+
equals(el.tabs( "length" ), 2, 'should contain 2 tab');
80+
81+
});
82+
83+
7484
})(jQuery);

ui/jquery.ui.tabs.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ $.widget( "ui.tabs", {
103103
fragmentId = /^#.+/; // Safari 2 reports '#' for an empty hash
104104

105105
this.list = this.element.find( "ol,ul" ).eq( 0 );
106-
this.lis = $( "li:has(a[href])", this.list );
106+
this.lis = $( " > li:has(a[href])", this.list );
107107
this.anchors = this.lis.map(function() {
108108
return $( "a", this )[ 0 ];
109109
});

0 commit comments

Comments
 (0)