Skip to content

Commit 0285529

Browse files
scottgonzalezscottgonzalez
committed
Accordion: Removed requirement for headers contain a child (and removed associated ui-accordion-heading class).
1 parent 4da7ec3 commit 0285529

13 files changed

+47
-65
lines changed

‎demos/accordion/collapsible.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@
2222
<div class="demo">
2323

2424
<div id="accordion">
25-
<h3><a href="#">Section 1</a></h3>
25+
<h3>Section 1</h3>
2626
<div>
2727
<p>Mauris mauris ante, blandit et, ultrices a, suscipit eget, quam. Integer ut neque. Vivamus nisi metus, molestie vel, gravida in, condimentum sit amet, nunc. Nam a nibh. Donec suscipit eros. Nam mi. Proin viverra leo ut odio. Curabitur malesuada. Vestibulum a velit eu ante scelerisque vulputate.</p>
2828
</div>
29-
<h3><a href="#">Section 2</a></h3>
29+
<h3>Section 2</h3>
3030
<div>
3131
<p>Sed non urna. Donec et ante. Phasellus eu ligula. Vestibulum sit amet purus. Vivamus hendrerit, dolor at aliquet laoreet, mauris turpis porttitor velit, faucibus interdum tellus libero ac justo. Vivamus non quam. In suscipit faucibus urna. </p>
3232
</div>
33-
<h3><a href="#">Section 3</a></h3>
33+
<h3>Section 3</h3>
3434
<div>
3535
<p>Nam enim risus, molestie et, porta ac, aliquam ac, risus. Quisque lobortis. Phasellus pellentesque purus in massa. Aenean in pede. Phasellus ac libero ac tellus pellentesque semper. Sed ac felis. Sed commodo, magna quis lacinia ornare, quam ante aliquam nisi, eu iaculis leo purus venenatis dui. </p>
3636
<ul>
@@ -39,7 +39,7 @@ <h3><a href="#">Section 3</a></h3>
3939
<li>List item three</li>
4040
</ul>
4141
</div>
42-
<h3><a href="#">Section 4</a></h3>
42+
<h3>Section 4</h3>
4343
<div>
4444
<p>Cras dictum. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Aenean lacinia mauris vel est. </p><p>Suspendisse eu nisl. Nullam ut libero. Integer dignissim consequat lectus. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. </p>
4545
</div>

‎demos/accordion/custom-icons.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,15 @@
3232
<div class="demo">
3333

3434
<div id="accordion">
35-
<h3><a href="#">Section 1</a></h3>
35+
<h3>Section 1</h3>
3636
<div>
3737
<p>Mauris mauris ante, blandit et, ultrices a, suscipit eget, quam. Integer ut neque. Vivamus nisi metus, molestie vel, gravida in, condimentum sit amet, nunc. Nam a nibh. Donec suscipit eros. Nam mi. Proin viverra leo ut odio. Curabitur malesuada. Vestibulum a velit eu ante scelerisque vulputate.</p>
3838
</div>
39-
<h3><a href="#">Section 2</a></h3>
39+
<h3>Section 2</h3>
4040
<div>
4141
<p>Sed non urna. Donec et ante. Phasellus eu ligula. Vestibulum sit amet purus. Vivamus hendrerit, dolor at aliquet laoreet, mauris turpis porttitor velit, faucibus interdum tellus libero ac justo. Vivamus non quam. In suscipit faucibus urna. </p>
4242
</div>
43-
<h3><a href="#">Section 3</a></h3>
43+
<h3>Section 3</h3>
4444
<div>
4545
<p>Nam enim risus, molestie et, porta ac, aliquam ac, risus. Quisque lobortis. Phasellus pellentesque purus in massa. Aenean in pede. Phasellus ac libero ac tellus pellentesque semper. Sed ac felis. Sed commodo, magna quis lacinia ornare, quam ante aliquam nisi, eu iaculis leo purus venenatis dui. </p>
4646
<ul>
@@ -49,7 +49,7 @@ <h3><a href="#">Section 3</a></h3>
4949
<li>List item three</li>
5050
</ul>
5151
</div>
52-
<h3><a href="#">Section 4</a></h3>
52+
<h3>Section 4</h3>
5353
<div>
5454
<p>Cras dictum. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Aenean lacinia mauris vel est. </p><p>Suspendisse eu nisl. Nullam ut libero. Integer dignissim consequat lectus. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. </p>
5555
</div>

‎demos/accordion/default.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<div class="demo">
2121

2222
<div id="accordion">
23-
<h3><a href="#">Section 1</a></h3>
23+
<h3>Section 1</h3>
2424
<div>
2525
<p>
2626
Mauris mauris ante, blandit et, ultrices a, suscipit eget, quam. Integer
@@ -29,7 +29,7 @@ <h3><a href="#">Section 1</a></h3>
2929
odio. Curabitur malesuada. Vestibulum a velit eu ante scelerisque vulputate.
3030
</p>
3131
</div>
32-
<h3><a href="#">Section 2</a></h3>
32+
<h3>Section 2</h3>
3333
<div>
3434
<p>
3535
Sed non urna. Donec et ante. Phasellus eu ligula. Vestibulum sit amet
@@ -38,7 +38,7 @@ <h3><a href="#">Section 2</a></h3>
3838
suscipit faucibus urna.
3939
</p>
4040
</div>
41-
<h3><a href="#">Section 3</a></h3>
41+
<h3>Section 3</h3>
4242
<div>
4343
<p>
4444
Nam enim risus, molestie et, porta ac, aliquam ac, risus. Quisque lobortis.
@@ -52,7 +52,7 @@ <h3><a href="#">Section 3</a></h3>
5252
<li>List item three</li>
5353
</ul>
5454
</div>
55-
<h3><a href="#">Section 4</a></h3>
55+
<h3>Section 4</h3>
5656
<div>
5757
<p>
5858
Cras dictum. Pellentesque habitant morbi tristique senectus et netus

‎demos/accordion/fillspace.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,15 @@ <h3 class="docs">Resize the outer container:</h3>
3737
<div id="accordionResizer" style="padding:10px; width:350px; height:220px;" class="ui-widget-content">
3838

3939
<div id="accordion">
40-
<h3><a href="#">Section 1</a></h3>
40+
<h3>Section 1</h3>
4141
<div>
4242
<p>Mauris mauris ante, blandit et, ultrices a, suscipit eget, quam. Integer ut neque. Vivamus nisi metus, molestie vel, gravida in, condimentum sit amet, nunc. Nam a nibh. Donec suscipit eros. Nam mi. Proin viverra leo ut odio. Curabitur malesuada. Vestibulum a velit eu ante scelerisque vulputate.</p>
4343
</div>
44-
<h3><a href="#">Section 2</a></h3>
44+
<h3>Section 2</h3>
4545
<div>
4646
<p>Sed non urna. Donec et ante. Phasellus eu ligula. Vestibulum sit amet purus. Vivamus hendrerit, dolor at aliquet laoreet, mauris turpis porttitor velit, faucibus interdum tellus libero ac justo. Vivamus non quam. In suscipit faucibus urna. </p>
4747
</div>
48-
<h3><a href="#">Section 3</a></h3>
48+
<h3>Section 3</h3>
4949
<div>
5050
<p>Nam enim risus, molestie et, porta ac, aliquam ac, risus. Quisque lobortis. Phasellus pellentesque purus in massa. Aenean in pede. Phasellus ac libero ac tellus pellentesque semper. Sed ac felis. Sed commodo, magna quis lacinia ornare, quam ante aliquam nisi, eu iaculis leo purus venenatis dui. </p>
5151
<ul>
@@ -54,7 +54,7 @@ <h3><a href="#">Section 3</a></h3>
5454
<li>List item three</li>
5555
</ul>
5656
</div>
57-
<h3><a href="#">Section 4</a></h3>
57+
<h3>Section 4</h3>
5858
<div>
5959
<p>Cras dictum. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Aenean lacinia mauris vel est. </p><p>Suspendisse eu nisl. Nullam ut libero. Integer dignissim consequat lectus. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. </p>
6060
</div>

‎demos/accordion/hoverintent.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
<div class="demo">
7474

7575
<div id="accordion">
76-
<h3><a href="#">Section 1</a></h3>
76+
<h3>Section 1</h3>
7777
<div>
7878
<p>
7979
Mauris mauris ante, blandit et, ultrices a, suscipit eget, quam. Integer
@@ -82,7 +82,7 @@ <h3><a href="#">Section 1</a></h3>
8282
odio. Curabitur malesuada. Vestibulum a velit eu ante scelerisque vulputate.
8383
</p>
8484
</div>
85-
<h3><a href="#">Section 2</a></h3>
85+
<h3>Section 2</h3>
8686
<div>
8787
<p>
8888
Sed non urna. Donec et ante. Phasellus eu ligula. Vestibulum sit amet
@@ -91,7 +91,7 @@ <h3><a href="#">Section 2</a></h3>
9191
suscipit faucibus urna.
9292
</p>
9393
</div>
94-
<h3><a href="#">Section 3</a></h3>
94+
<h3>Section 3</h3>
9595
<div>
9696
<p>
9797
Nam enim risus, molestie et, porta ac, aliquam ac, risus. Quisque lobortis.
@@ -105,7 +105,7 @@ <h3><a href="#">Section 3</a></h3>
105105
<li>List item three</li>
106106
</ul>
107107
</div>
108-
<h3><a href="#">Section 4</a></h3>
108+
<h3>Section 4</h3>
109109
<div>
110110
<p>
111111
Cras dictum. Pellentesque habitant morbi tristique senectus et netus

‎demos/accordion/mouseover.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@
2222
<div class="demo">
2323

2424
<div id="accordion">
25-
<h3><a href="#">Section 1</a></h3>
25+
<h3>Section 1</h3>
2626
<div>
2727
<p>Mauris mauris ante, blandit et, ultrices a, suscipit eget, quam. Integer ut neque. Vivamus nisi metus, molestie vel, gravida in, condimentum sit amet, nunc. Nam a nibh. Donec suscipit eros. Nam mi. Proin viverra leo ut odio. Curabitur malesuada. Vestibulum a velit eu ante scelerisque vulputate.</p>
2828
</div>
29-
<h3><a href="#">Section 2</a></h3>
29+
<h3>Section 2</h3>
3030
<div>
3131
<p>Sed non urna. Donec et ante. Phasellus eu ligula. Vestibulum sit amet purus. Vivamus hendrerit, dolor at aliquet laoreet, mauris turpis porttitor velit, faucibus interdum tellus libero ac justo. Vivamus non quam. In suscipit faucibus urna. </p>
3232
</div>
33-
<h3><a href="#">Section 3</a></h3>
33+
<h3>Section 3</h3>
3434
<div>
3535
<p>Nam enim risus, molestie et, porta ac, aliquam ac, risus. Quisque lobortis. Phasellus pellentesque purus in massa. Aenean in pede. Phasellus ac libero ac tellus pellentesque semper. Sed ac felis. Sed commodo, magna quis lacinia ornare, quam ante aliquam nisi, eu iaculis leo purus venenatis dui. </p>
3636
<ul>
@@ -39,7 +39,7 @@ <h3><a href="#">Section 3</a></h3>
3939
<li>List item three</li>
4040
</ul>
4141
</div>
42-
<h3><a href="#">Section 4</a></h3>
42+
<h3>Section 4</h3>
4343
<div>
4444
<p>Cras dictum. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Aenean lacinia mauris vel est. </p><p>Suspendisse eu nisl. Nullam ut libero. Integer dignissim consequat lectus. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. </p>
4545
</div>

‎demos/accordion/no-auto-height.html

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@
2222
<div class="demo">
2323

2424
<div id="accordion">
25-
<h3><a href="#section1">Section 1</a></h3>
25+
<h3>Section 1</h3>
2626
<div>
2727
<p>Mauris mauris ante, blandit et, ultrices a, susceros. Nam mi. Proin viverra leo ut odio. Curabitur malesuada. Vestibulum a velit eu ante scelerisque vulputate.</p>
2828
</div>
29-
<h3><a href="#section2">Section 2</a></h3>
29+
<h3>Section 2</h3>
3030
<div>
3131
<p>Sed non urna. Donec et ante. Phasellus eu ligula. Vestibulum sit amet purus. Vivamus hendrerit, dolor at aliquet laoreet, mauris turpis porttitor velit, faucibus interdum tellus libero ac justo. Vivamus non quam. In suscipit faucibus urna. </p>
3232
</div>
33-
<h3><a href="#section3">Section 3</a></h3>
33+
<h3>Section 3</h3>
3434
<div>
3535
<p>Nam enim risus, molestie et, porta ac, aliquam ac, risus. Quisque lobortis. Phasellus pellentesque purus in massa. Aenean in pede. Phasellus ac libero ac tellus pellentesque semper. Sed ac felis. Sed commodo, magna quis lacinia ornare, quam ante aliquam nisi, eu iaculis leo purus venenatis dui. </p>
3636
<ul>
@@ -42,7 +42,6 @@ <h3><a href="#section3">Section 3</a></h3>
4242
<li>List item</li>
4343
<li>List item</li>
4444
</ul>
45-
<a href="#othercontent">Link to other content</a>
4645
</div>
4746
</div>
4847

‎demos/accordion/sortable.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,19 +39,19 @@
3939

4040
<div id="accordion">
4141
<div class="group">
42-
<h3><a href="#">Section 1</a></h3>
42+
<h3>Section 1</h3>
4343
<div>
4444
<p>Mauris mauris ante, blandit et, ultrices a, suscipit eget, quam. Integer ut neque. Vivamus nisi metus, molestie vel, gravida in, condimentum sit amet, nunc. Nam a nibh. Donec suscipit eros. Nam mi. Proin viverra leo ut odio. Curabitur malesuada. Vestibulum a velit eu ante scelerisque vulputate.</p>
4545
</div>
4646
</div>
4747
<div class="group">
48-
<h3><a href="#">Section 2</a></h3>
48+
<h3>Section 2</h3>
4949
<div>
5050
<p>Sed non urna. Donec et ante. Phasellus eu ligula. Vestibulum sit amet purus. Vivamus hendrerit, dolor at aliquet laoreet, mauris turpis porttitor velit, faucibus interdum tellus libero ac justo. Vivamus non quam. In suscipit faucibus urna. </p>
5151
</div>
5252
</div>
5353
<div class="group">
54-
<h3><a href="#">Section 3</a></h3>
54+
<h3>Section 3</h3>
5555
<div>
5656
<p>Nam enim risus, molestie et, porta ac, aliquam ac, risus. Quisque lobortis. Phasellus pellentesque purus in massa. Aenean in pede. Phasellus ac libero ac tellus pellentesque semper. Sed ac felis. Sed commodo, magna quis lacinia ornare, quam ante aliquam nisi, eu iaculis leo purus venenatis dui. </p>
5757
<ul>
@@ -62,7 +62,7 @@ <h3><a href="#">Section 3</a></h3>
6262
</div>
6363
</div>
6464
<div class="group">
65-
<h3><a href="#">Section 4</a></h3>
65+
<h3>Section 4</h3>
6666
<div>
6767
<p>Cras dictum. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Aenean lacinia mauris vel est. </p><p>Suspendisse eu nisl. Nullam ut libero. Integer dignissim consequat lectus. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. </p>
6868
</div>

‎tests/unit/accordion/accordion.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ <h2 id="qunit-userAgent"></h2>
5151
<div id="qunit-fixture">
5252

5353
<div id="list1" class="foo">
54-
<h3 class="bar"><a class="anchor">There is one obvious advantage:</a></h3>
54+
<h3 class="bar">There is one obvious advantage:</h3>
5555
<div class="foo">
5656
<p>
5757
You've seen it coming!
@@ -61,7 +61,7 @@ <h3 class="bar"><a class="anchor">There is one obvious advantage:</a></h3>
6161
Well, at least no free beer. Perhaps a bear, if you can afford it.
6262
</p>
6363
</div>
64-
<h3 class="bar"><a class="anchor">Now that you've got...</a></h3>
64+
<h3 class="bar">Now that you've got...</h3>
6565
<div class="foo">
6666
<p>
6767
your bear, you have to admit it!
@@ -72,7 +72,7 @@ <h3 class="bar"><a class="anchor">Now that you've got...</a></h3>
7272
We could talk about renting one.
7373
</p>
7474
</div>
75-
<h3 class="bar"><a class="anchor">Rent one bear, ...</a></h3>
75+
<h3 class="bar">Rent one bear, ...</h3>
7676
<div class="foo">
7777
<p>
7878
get two for three beer.
@@ -120,19 +120,19 @@ <h2><a href="?p=1.1.3">Drums</a></h2>
120120

121121
<dl id="accordion-dl">
122122
<dt>
123-
<a href="#">Accordion Header 1</a>
123+
Accordion Header 1
124124
</dt>
125125
<dd>
126126
Accordion Content 1
127127
</dd>
128128
<dt>
129-
<a href="#">Accordion Header 2</a>
129+
Accordion Header 2
130130
</dt>
131131
<dd>
132132
Accordion Content 2
133133
</dd>
134134
<dt>
135-
<a href="#">Accordion Header 3</a>
135+
Accordion Header 3
136136
</dt>
137137
<dd>
138138
Accordion Content 3

‎tests/unit/accordion/accordion_core.js

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,6 @@ test( "handle click on header-descendant", function() {
2424
accordion_state( element, 0, 1, 0 );
2525
});
2626

27-
test( "ui-accordion-heading class added to headers anchor", function() {
28-
expect( 1 );
29-
var element = $( "#list1" ).accordion();
30-
var anchors = element.find( ".ui-accordion-heading" );
31-
equal( anchors.length, 3 );
32-
});
33-
3427
test( "accessibility", function () {
3528
expect( 13 );
3629
var element = $( "#list1" ).accordion().accordion( "option", "active", 1 );

‎tests/unit/accordion/accordion_deprecated.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ <h2 id="qunit-userAgent"></h2>
4949
<div id="qunit-fixture">
5050

5151
<div id="list1" class="foo">
52-
<h3 class="bar"><a class="anchor">There is one obvious advantage:</a></h3>
52+
<h3 class="bar">There is one obvious advantage:</h3>
5353
<div class="foo">
5454
<p>
5555
You've seen it coming!
@@ -59,7 +59,7 @@ <h3 class="bar"><a class="anchor">There is one obvious advantage:</a></h3>
5959
Well, at least no free beer. Perhaps a bear, if you can afford it.
6060
</p>
6161
</div>
62-
<h3 class="bar"><a class="anchor">Now that you've got...</a></h3>
62+
<h3 class="bar">Now that you've got...</h3>
6363
<div class="foo">
6464
<p>
6565
your bear, you have to admit it!
@@ -70,7 +70,7 @@ <h3 class="bar"><a class="anchor">Now that you've got...</a></h3>
7070
We could talk about renting one.
7171
</p>
7272
</div>
73-
<h3 class="bar"><a class="anchor">Rent one bear, ...</a></h3>
73+
<h3 class="bar">Rent one bear, ...</h3>
7474
<div class="foo">
7575
<p>
7676
get two for three beer.
@@ -118,19 +118,19 @@ <h2><a href="?p=1.1.3">Drums</a></h2>
118118

119119
<dl id="accordion-dl">
120120
<dt>
121-
<a href="#">Accordion Header 1</a>
121+
Accordion Header 1
122122
</dt>
123123
<dd>
124124
Accordion Content 1
125125
</dd>
126126
<dt>
127-
<a href="#">Accordion Header 2</a>
127+
Accordion Header 2
128128
</dt>
129129
<dd>
130130
Accordion Content 2
131131
</dd>
132132
<dt>
133-
<a href="#">Accordion Header 3</a>
133+
Accordion Header 3
134134
</dt>
135135
<dd>
136136
Accordion Content 3

‎themes/base/jquery.ui.accordion.css

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,10 @@
99
*/
1010
/* IE/Win - Fix animation bug - #4615 */
1111
.ui-accordion { width: 100%; }
12-
.ui-accordion .ui-accordion-header { cursor: pointer; position: relative; margin-top: 2px; zoom: 1; }
13-
.ui-accordion .ui-accordion-heading { display: block; font-size: 1em; padding: .5em .5em .5em .7em; }
14-
.ui-accordion-icons a.ui-accordion-heading { padding-left: 2.2em; }
15-
.ui-accordion-noicons a.ui-accordion-heading { padding-left: .7em; }
16-
.ui-accordion-icons .ui-accordion-icons a.ui-accordion-heading { padding-left: 2.2em; }
12+
.ui-accordion .ui-accordion-header { display: block; cursor: pointer; position: relative; margin-top: 2px; padding: .5em .5em .5em .7em; zoom: 1; }
13+
.ui-accordion .ui-accordion-icons { padding-left: 2.2em; }
14+
.ui-accordion .ui-accordion-noicons { padding-left: .7em; }
15+
.ui-accordion .ui-accordion-icons .ui-accordion-icons { padding-left: 2.2em; }
1716
.ui-accordion .ui-accordion-header .ui-accordion-header-icon { position: absolute; left: .5em; top: 50%; margin-top: -8px; }
1817
.ui-accordion .ui-accordion-content { padding: 1em 2.2em; border-top: 0; overflow: auto; display: none; zoom: 1; }
1918
.ui-accordion .ui-accordion-content-active { display: block; }

0 commit comments

Comments
 (0)