Skip to content

Commit 009850a

Browse files
arschmitzarschmitz
committed
Accordion: Style updates
Ref #14246 Ref gh-1588
1 parent 8029cc9 commit 009850a

File tree

7 files changed

+200
-191
lines changed

7 files changed

+200
-191
lines changed

‎tests/unit/accordion/common.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ common.testWidget( "accordion", {
2222
"header": "ui-icon-triangle-1-e"
2323
},
2424

25-
// callbacks
25+
// Callbacks
2626
activate: null,
2727
beforeActivate: null,
2828
create: null
2929
}
30-
});
30+
} );
3131

3232
} );

‎tests/unit/accordion/core.js

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,33 +32,33 @@ $.each( { div: "#list1", ul: "#navigation", dl: "#accordion-dl" }, function( typ
3232
deepEqual( element.find( ".ui-accordion-header" ).next().get(),
3333
element.find( ".ui-accordion-content" ).get(),
3434
"content panels come immediately after headers" );
35-
});
36-
});
35+
} );
36+
} );
3737

3838
test( "handle click on header-descendant", function() {
3939
expect( 1 );
4040
var element = $( "#navigation" ).accordion();
4141
$( "#navigation h2:eq(1) a" ).trigger( "click" );
4242
state( element, 0, 1, 0 );
43-
});
43+
} );
4444

45-
test( "accessibility", function () {
45+
test( "accessibility", function() {
4646
expect( 61 );
47-
var element = $( "#list1" ).accordion({
47+
var element = $( "#list1" ).accordion( {
4848
active: 1,
4949
collapsible: true
50-
}),
50+
} ),
5151
headers = element.find( ".ui-accordion-header" );
5252

5353
equal( element.attr( "role" ), "tablist", "element role" );
54-
headers.each(function( i ) {
54+
headers.each( function( i ) {
5555
var header = headers.eq( i ),
5656
panel = header.next();
5757
equal( header.attr( "role" ), "tab", "header " + i + " role" );
5858
equal( header.attr( "aria-controls" ), panel.attr( "id" ), "header " + i + " aria-controls" );
5959
equal( panel.attr( "role" ), "tabpanel", "panel " + i + " role" );
6060
equal( panel.attr( "aria-labelledby" ), header.attr( "id" ), "panel " + i + " aria-labelledby" );
61-
});
61+
} );
6262

6363
equal( headers.eq( 1 ).attr( "tabindex" ), 0, "active header has tabindex=0" );
6464
equal( headers.eq( 1 ).attr( "aria-selected" ), "true", "active tab (1) has aria-selected=true" );
@@ -115,7 +115,7 @@ test( "accessibility", function () {
115115
equal( headers.eq( 2 ).attr( "aria-expanded" ), "false", "inactive tab (2) has aria-expanded=false" );
116116
equal( headers.eq( 2 ).next().attr( "aria-hidden" ), "true", "inactive tabpanel (2) has aria-hidden=true" );
117117

118-
});
118+
} );
119119

120120
asyncTest( "keyboard support", function( assert ) {
121121
expect( 13 );
@@ -180,7 +180,7 @@ asyncTest( "keyboard support", function( assert ) {
180180
}
181181

182182
function step9() {
183-
equal( element.accordion( "option", "active" ) , 2, "ENTER activates panel" );
183+
equal( element.accordion( "option", "active" ), 2, "ENTER activates panel" );
184184
headers.eq( 1 ).simulate( "keydown", { keyCode: keyCode.SPACE } );
185185
setTimeout( step10 );
186186
}
@@ -202,6 +202,6 @@ asyncTest( "keyboard support", function( assert ) {
202202
assert.hasClasses( headers.eq( 1 ), "ui-state-focus", "CTRL+UP moves focus to header" );
203203
start();
204204
}
205-
});
205+
} );
206206

207207
} );

‎tests/unit/accordion/events.js

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -16,44 +16,44 @@ test( "create", function() {
1616
headers = element.children( "h3" ),
1717
contents = headers.next();
1818

19-
element.accordion({
19+
element.accordion( {
2020
create: function( event, ui ) {
2121
equal( ui.header.length, 1, "header length" );
2222
strictEqual( ui.header[ 0 ], headers[ 0 ], "header" );
2323
equal( ui.panel.length, 1, "panel length" );
2424
strictEqual( ui.panel[ 0 ], contents[ 0 ], "panel" );
2525
}
26-
});
26+
} );
2727
element.accordion( "destroy" );
2828

29-
element.accordion({
29+
element.accordion( {
3030
active: 2,
3131
create: function( event, ui ) {
3232
equal( ui.header.length, 1, "header length" );
3333
strictEqual( ui.header[ 0 ], headers[ 2 ], "header" );
3434
equal( ui.panel.length, 1, "panel length" );
3535
strictEqual( ui.panel[ 0 ], contents[ 2 ], "panel" );
3636
}
37-
});
37+
} );
3838
element.accordion( "destroy" );
3939

40-
element.accordion({
40+
element.accordion( {
4141
active: false,
4242
collapsible: true,
4343
create: function( event, ui ) {
4444
equal( ui.header.length, 0, "header length" );
4545
equal( ui.panel.length, 0, "panel length" );
4646
}
47-
});
47+
} );
4848
element.accordion( "destroy" );
49-
});
49+
} );
5050

5151
test( "beforeActivate", function() {
5252
expect( 38 );
53-
var element = $( "#list1" ).accordion({
53+
var element = $( "#list1" ).accordion( {
5454
active: false,
5555
collapsible: true
56-
}),
56+
} ),
5757
headers = element.find( ".ui-accordion-header" ),
5858
content = element.find( ".ui-accordion-content" );
5959

@@ -66,7 +66,7 @@ test( "beforeActivate", function() {
6666
equal( ui.newPanel.length, 1 );
6767
strictEqual( ui.newPanel[ 0 ], content[ 0 ] );
6868
state( element, 0, 0, 0 );
69-
});
69+
} );
7070
element.accordion( "option", "active", 0 );
7171
state( element, 1, 0, 0 );
7272

@@ -81,7 +81,7 @@ test( "beforeActivate", function() {
8181
equal( ui.newPanel.length, 1 );
8282
strictEqual( ui.newPanel[ 0 ], content[ 1 ] );
8383
state( element, 1, 0, 0 );
84-
});
84+
} );
8585
headers.eq( 1 ).trigger( "click" );
8686
state( element, 0, 1, 0 );
8787

@@ -94,7 +94,7 @@ test( "beforeActivate", function() {
9494
equal( ui.newHeader.length, 0 );
9595
equal( ui.newPanel.length, 0 );
9696
state( element, 0, 1, 0 );
97-
});
97+
} );
9898
element.accordion( "option", "active", false );
9999
state( element, 0, 0, 0 );
100100

@@ -108,17 +108,17 @@ test( "beforeActivate", function() {
108108
strictEqual( ui.newPanel[ 0 ], content[ 2 ] );
109109
event.preventDefault();
110110
state( element, 0, 0, 0 );
111-
});
111+
} );
112112
element.accordion( "option", "active", 2 );
113113
state( element, 0, 0, 0 );
114-
});
114+
} );
115115

116116
test( "activate", function() {
117117
expect( 21 );
118-
var element = $( "#list1" ).accordion({
118+
var element = $( "#list1" ).accordion( {
119119
active: false,
120120
collapsible: true
121-
}),
121+
} ),
122122
headers = element.find( ".ui-accordion-header" ),
123123
content = element.find( ".ui-accordion-content" );
124124

@@ -129,7 +129,7 @@ test( "activate", function() {
129129
strictEqual( ui.newHeader[ 0 ], headers[ 0 ] );
130130
equal( ui.newPanel.length, 1 );
131131
strictEqual( ui.newPanel[ 0 ], content[ 0 ] );
132-
});
132+
} );
133133
element.accordion( "option", "active", 0 );
134134

135135
element.one( "accordionactivate", function( event, ui ) {
@@ -141,7 +141,7 @@ test( "activate", function() {
141141
strictEqual( ui.newHeader[ 0 ], headers[ 1 ] );
142142
equal( ui.newPanel.length, 1 );
143143
strictEqual( ui.newPanel[ 0 ], content[ 1 ] );
144-
});
144+
} );
145145
headers.eq( 1 ).trigger( "click" );
146146

147147
element.one( "accordionactivate", function( event, ui ) {
@@ -151,18 +151,18 @@ test( "activate", function() {
151151
strictEqual( ui.oldPanel[ 0 ], content[ 1 ] );
152152
equal( ui.newHeader.length, 0 );
153153
equal( ui.newPanel.length, 0 );
154-
});
154+
} );
155155
element.accordion( "option", "active", false );
156156

157-
// prevent activation
157+
// Prevent activation
158158
element.one( "accordionbeforeactivate", function( event ) {
159159
ok( true );
160160
event.preventDefault();
161-
});
161+
} );
162162
element.one( "accordionactivate", function() {
163163
ok( false );
164-
});
164+
} );
165165
element.accordion( "option", "active", 1 );
166-
});
166+
} );
167167

168168
} );

‎tests/unit/accordion/helper.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ define( [
66

77
return $.extend( helper, {
88
equalHeight: function( accordion, height ) {
9-
accordion.find( ".ui-accordion-content" ).each(function() {
9+
accordion.find( ".ui-accordion-content" ).each( function() {
1010
equal( $( this ).outerHeight(), height );
11-
});
11+
} );
1212
},
1313

1414
setupTeardown: function() {
@@ -25,10 +25,10 @@ return $.extend( helper, {
2525

2626
state: function( accordion ) {
2727
var expected = $.makeArray( arguments ).slice( 1 ),
28-
actual = accordion.find( ".ui-accordion-content" ).map(function() {
28+
actual = accordion.find( ".ui-accordion-content" ).map( function() {
2929
return $( this ).css( "display" ) === "none" ? 0 : 1;
30-
}).get();
31-
QUnit.push( QUnit.equiv(actual, expected), actual, expected );
30+
} ).get();
31+
QUnit.push( QUnit.equiv( actual, expected ), actual, expected );
3232
}
3333
} );
3434

‎tests/unit/accordion/methods.js

Lines changed: 31 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ test( "destroy", function( assert ) {
1414
expect( 1 );
1515
assert.domEqual( "#list1", function() {
1616
$( "#list1" ).accordion().accordion( "destroy" );
17-
});
18-
});
17+
} );
18+
} );
1919

2020
test( "enable/disable", function( assert ) {
2121
expect( 7 );
@@ -28,26 +28,27 @@ test( "enable/disable", function( assert ) {
2828
equal( element.attr( "aria-disabled" ), "true", "element gets aria-disabled" );
2929
assert.hasClasses( element, "ui-accordion-disabled" );
3030

31-
// event does nothing
31+
// Event does nothing
3232
element.find( ".ui-accordion-header" ).eq( 1 ).trigger( "click" );
3333
state( element, 1, 0, 0 );
34-
// option still works
34+
35+
// Option still works
3536
element.accordion( "option", "active", 1 );
3637
state( element, 0, 1, 0 );
3738
element.accordion( "enable" );
3839
element.accordion( "option", "active", 2 );
3940
state( element, 0, 0, 1 );
40-
});
41+
} );
4142

4243
test( "refresh", function() {
4344
expect( 19 );
4445
var element = $( "#navigation" )
4546
.parent()
4647
.height( 300 )
4748
.end()
48-
.accordion({
49+
.accordion( {
4950
heightStyle: "fill"
50-
});
51+
} );
5152
equalHeight( element, 255 );
5253

5354
element.parent().height( 500 );
@@ -58,79 +59,79 @@ test( "refresh", function() {
5859
element.accordion();
5960
state( element, 1, 0, 0 );
6061

61-
// disable panel via markup
62+
// Disable panel via markup
6263
element.find( "h3.bar" ).eq( 1 ).addClass( "ui-state-disabled" );
6364
element.accordion( "refresh" );
6465
state( element, 1, 0, 0 );
6566

66-
// don't add multiple icons
67+
// Don't add multiple icons
6768
element.accordion( "refresh" );
6869
equal( element.find( ".ui-accordion-header-icon" ).length, 3 );
6970

70-
// add a panel
71+
// Add a panel
7172
element
72-
.append("<h3 class='bar' id='new_1'>new 1</h3>")
73-
.append("<div class='foo' id='new_1_panel'>new 1</div>");
73+
.append( "<h3 class='bar' id='new_1'>new 1</h3>" )
74+
.append( "<div class='foo' id='new_1_panel'>new 1</div>" );
7475
element.accordion( "refresh" );
7576
state( element, 1, 0, 0, 0 );
7677

77-
// remove all tabs
78+
// Remove all tabs
7879
element.find( "h3.bar, div.foo" ).remove();
7980
element.accordion( "refresh" );
8081
state( element );
8182
equal( element.accordion( "option", "active" ), false, "no active accordion panel" );
8283

83-
// add panels
84+
// Add panels
8485
element
85-
.append("<h3 class='bar' id='new_2'>new 2</h3>")
86-
.append("<div class='foo' id='new_2_panel'>new 2</div>")
87-
.append("<h3 class='bar' id='new_3'>new 3</h3>")
88-
.append("<div class='foo' id='new_3_panel'>new 3</div>")
89-
.append("<h3 class='bar' id='new_4'>new 4</h3>")
90-
.append("<div class='foo' id='new_4_panel'>new 4</div>")
91-
.append("<h3 class='bar' id='new_5'>new 5</h3>")
92-
.append("<div class='foo' id='new_5_panel'>new 5</div>");
86+
.append( "<h3 class='bar' id='new_2'>new 2</h3>" )
87+
.append( "<div class='foo' id='new_2_panel'>new 2</div>" )
88+
.append( "<h3 class='bar' id='new_3'>new 3</h3>" )
89+
.append( "<div class='foo' id='new_3_panel'>new 3</div>" )
90+
.append( "<h3 class='bar' id='new_4'>new 4</h3>" )
91+
.append( "<div class='foo' id='new_4_panel'>new 4</div>" )
92+
.append( "<h3 class='bar' id='new_5'>new 5</h3>" )
93+
.append( "<div class='foo' id='new_5_panel'>new 5</div>" );
9394
element.accordion( "refresh" );
9495
state( element, 1, 0, 0, 0 );
9596

96-
// activate third tab
97+
// Activate third tab
9798
element.accordion( "option", "active", 2 );
9899
state( element, 0, 0, 1, 0 );
99100

100-
// remove fourth panel, third panel should stay active
101+
// Remove fourth panel, third panel should stay active
101102
element.find( "h3.bar" ).eq( 3 ).remove();
102103
element.find( "div.foo" ).eq( 3 ).remove();
103104
element.accordion( "refresh" );
104105
state( element, 0, 0, 1 );
105106

106-
// remove third (active) panel, second panel should become active
107+
// Remove third (active) panel, second panel should become active
107108
element.find( "h3.bar" ).eq( 2 ).remove();
108109
element.find( "div.foo" ).eq( 2 ).remove();
109110
element.accordion( "refresh" );
110111
state( element, 0, 1 );
111112

112-
// remove first panel, previously active panel (now first) should stay active
113+
// Remove first panel, previously active panel (now first) should stay active
113114
element.find( "h3.bar" ).eq( 0 ).remove();
114115
element.find( "div.foo" ).eq( 0 ).remove();
115116
element.accordion( "refresh" );
116117
state( element, 1 );
117118

118-
// collapse all panels
119+
// Collapse all panels
119120
element.accordion( "option", {
120121
collapsible: true,
121122
active: false
122-
});
123+
} );
123124
state( element, 0 );
124125
element.accordion( "refresh" );
125126
state( element, 0 );
126-
});
127+
} );
127128

128129
test( "widget", function() {
129130
expect( 2 );
130131
var element = $( "#list1" ).accordion(),
131132
widgetElement = element.accordion( "widget" );
132133
equal( widgetElement.length, 1, "one element" );
133134
strictEqual( widgetElement[ 0 ], element[ 0 ], "same element" );
134-
});
135+
} );
135136

136137
} );

0 commit comments

Comments
 (0)