Skip to content

Commit 6c0bb24

Browse files
committed
Tabs: Style updates
Ref #14246
1 parent a0892ec commit 6c0bb24

7 files changed

Lines changed: 202 additions & 164 deletions

File tree

tests/unit/tabs/common.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@ common.testWidget( "tabs", {
2626
create: null,
2727
load: null
2828
}
29-
});
29+
} );
3030

3131
} );

tests/unit/tabs/core.js

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ test( "markup structure", function( assert ) {
4040
assert.hasClasses( panels[ 1 ], "ui-tabs-panel ui-widget-content" );
4141
assert.hasClasses( panels[ 2 ], "ui-tabs-panel ui-widget-content" );
4242
equal( panels.length, 3, "There are exactly 3 tab panels" );
43-
});
43+
} );
4444

45-
$.each({
45+
$.each( {
4646
"deep ul": "#tabs3",
4747
"multiple lists, ul first": "#tabs4",
4848
"multiple lists, ol first": "#tabs5",
@@ -53,24 +53,24 @@ $.each({
5353
var element = $( selector ).tabs();
5454
assert.hasClasses( element, "ui-tabs" );
5555
assert.hasClasses( $( selector + "-list" ), "ui-tabs-nav" );
56-
});
57-
});
56+
} );
57+
} );
5858

5959
// #5893 - Sublist in the tab list are considered as tab
6060
test( "nested list", function() {
6161
expect( 1 );
6262

6363
var element = $( "#tabs6" ).tabs();
6464
equal( element.tabs( "instance" ).anchors.length, 2, "should contain 2 tab" );
65-
});
65+
} );
6666

6767
test( "disconnected from DOM", function() {
6868
expect( 2 );
6969

7070
var element = $( "#tabs1" ).remove().tabs();
7171
equal( element.find( ".ui-tabs-nav" ).length, 1, "should initialize nav" );
7272
equal( element.find( ".ui-tabs-panel" ).length, 3, "should initialize panels" );
73-
});
73+
} );
7474

7575
test( "non-tab list items", function() {
7676
expect( 2 );
@@ -79,38 +79,38 @@ test( "non-tab list items", function() {
7979
equal( element.tabs( "option", "active" ), 0, "defaults to first tab" );
8080
equal( element.find( ".ui-tabs-nav li.ui-state-active" ).index(), 1,
8181
"first actual tab is active" );
82-
});
82+
} );
8383

8484
test( "aria-controls", function() {
8585
expect( 7 );
8686
var element = $( "#tabs1" ).tabs(),
8787
tabs = element.find( ".ui-tabs-nav li" );
88-
tabs.each(function() {
88+
tabs.each( function() {
8989
var tab = $( this ),
9090
anchor = tab.find( ".ui-tabs-anchor" );
9191
equal( anchor.prop( "hash" ).substring( 1 ), tab.attr( "aria-controls" ) );
92-
});
92+
} );
9393

9494
element = $( "#tabs2" ).tabs();
9595
tabs = element.find( ".ui-tabs-nav li" );
9696
equal( tabs.eq( 0 ).attr( "aria-controls" ), "colon:test" );
9797
equal( tabs.eq( 1 ).attr( "aria-controls" ), "inline-style" );
9898
ok( /^ui-id-\d+$/.test( tabs.eq( 2 ).attr( "aria-controls" ) ), "generated id" );
9999
equal( tabs.eq( 3 ).attr( "aria-controls" ), "custom-id" );
100-
});
100+
} );
101101

102102
test( "accessibility", function() {
103103
expect( 49 );
104-
var element = $( "#tabs1" ).tabs({
104+
var element = $( "#tabs1" ).tabs( {
105105
active: 1,
106106
disabled: [ 2 ]
107-
}),
107+
} ),
108108
tabs = element.find( ".ui-tabs-nav li" ),
109109
anchors = tabs.find( ".ui-tabs-anchor" ),
110110
panels = element.find( ".ui-tabs-panel" );
111111

112112
equal( element.find( ".ui-tabs-nav" ).attr( "role" ), "tablist", "tablist role" );
113-
tabs.each(function( index ) {
113+
tabs.each( function( index ) {
114114
var tab = tabs.eq( index ),
115115
anchor = anchors.eq( index ),
116116
anchorId = anchor.attr( "id" ),
@@ -121,7 +121,7 @@ test( "accessibility", function() {
121121
equal( anchor.attr( "tabindex" ), -1, "anchor " + index + " tabindex" );
122122
equal( panel.attr( "role" ), "tabpanel", "panel " + index + " role" );
123123
equal( panel.attr( "aria-labelledby" ), anchorId, "panel " + index + " aria-labelledby" );
124-
});
124+
} );
125125

126126
equal( tabs.eq( 1 ).attr( "aria-selected" ), "true", "active tab has aria-selected=true" );
127127
equal( tabs.eq( 1 ).attr( "tabindex" ), 0, "active tab has tabindex=0" );
@@ -155,7 +155,7 @@ test( "accessibility", function() {
155155
equal( tabs.eq( 2 ).attr( "aria-disabled" ), "true", "disabled tab has aria-disabled=true" );
156156
equal( tabs.eq( 2 ).attr( "aria-expanded" ), "false", "inactive tab has aria-expanded=false" );
157157
equal( panels.eq( 2 ).attr( "aria-hidden" ), "true", "inactive panel has aria-hidden=true" );
158-
});
158+
} );
159159

160160
asyncTest( "accessibility - ajax", function( assert ) {
161161
expect( 6 );
@@ -169,19 +169,19 @@ asyncTest( "accessibility - ajax", function( assert ) {
169169
assert.hasClasses( tab, "ui-tabs-loading" );
170170
equal( panel.attr( "aria-busy" ), "true", "panel has aria-busy during load" );
171171
element.one( "tabsload", function() {
172-
setTimeout(function() {
172+
setTimeout( function() {
173173
equal( panel.attr( "aria-busy" ), null, "panel does not have aria-busy after load" );
174174
assert.lacksClasses( tab, "ui-tabs-loading" );
175175
start();
176176
}, 1 );
177-
});
178-
});
177+
} );
178+
} );
179179

180180
asyncTest( "keyboard support - LEFT, RIGHT, UP, DOWN, HOME, END, SPACE, ENTER", function( assert ) {
181181
expect( 92 );
182-
var element = $( "#tabs1" ).tabs({
182+
var element = $( "#tabs1" ).tabs( {
183183
collapsible: true
184-
}),
184+
} ),
185185
tabs = element.find( ".ui-tabs-nav li" ),
186186
panels = element.find( ".ui-tabs-panel" ),
187187
keyCode = $.ui.keyCode;
@@ -328,10 +328,10 @@ asyncTest( "keyboard support - LEFT, RIGHT, UP, DOWN, HOME, END, SPACE, ENTER",
328328
}
329329

330330
setTimeout( step1 );
331-
});
331+
} );
332332

333333
// Navigation with CTRL and COMMAND (both behave the same)
334-
$.each({
334+
$.each( {
335335
ctrl: "CTRL",
336336
meta: "COMMAND"
337337
}, function( modifier, label ) {
@@ -547,8 +547,8 @@ $.each({
547547
}
548548

549549
setTimeout( step1 );
550-
});
551-
});
550+
} );
551+
} );
552552

553553
asyncTest( "keyboard support - CTRL+UP, ALT+PAGE_DOWN, ALT+PAGE_UP", function( assert ) {
554554
expect( 50 );
@@ -640,34 +640,34 @@ asyncTest( "keyboard support - CTRL+UP, ALT+PAGE_DOWN, ALT+PAGE_UP", function( a
640640
}
641641

642642
setTimeout( step1 );
643-
});
643+
} );
644644

645645
test( "#3627 - Ajax tab with url containing a fragment identifier fails to load", function() {
646646
expect( 1 );
647647

648-
$( "#tabs2" ).tabs({
648+
$( "#tabs2" ).tabs( {
649649
active: 2,
650650
beforeLoad: function( event, ui ) {
651651
event.preventDefault();
652652
ok( /test.html$/.test( ui.ajaxSettings.url ), "should ignore fragment identifier" );
653653
}
654-
});
655-
});
654+
} );
655+
} );
656656

657657
test( "#4033 - IE expands hash to full url and misinterprets tab as ajax", function() {
658658
expect( 2 );
659659

660-
var element = $("<div><ul><li><a href='#tab'>Tab</a></li></ul><div id='tab'></div></div>");
661-
element.appendTo("#qunit-fixture");
662-
element.tabs({
660+
var element = $( "<div><ul><li><a href='#tab'>Tab</a></li></ul><div id='tab'></div></div>" );
661+
element.appendTo( "#qunit-fixture" );
662+
element.tabs( {
663663
beforeLoad: function() {
664664
event.preventDefault();
665665
ok( false, "should not be an ajax tab" );
666666
}
667-
});
667+
} );
668668

669-
equal( element.find(".ui-tabs-nav li").attr("aria-controls"), "tab", "aria-contorls attribute is correct" );
669+
equal( element.find( ".ui-tabs-nav li" ).attr( "aria-controls" ), "tab", "aria-contorls attribute is correct" );
670670
state( element, 1 );
671-
});
671+
} );
672672

673673
} );

0 commit comments

Comments
 (0)