Skip to content

Commit de2ef2a

Browse files
tjvantolltjvantoll
committed
Menu: Wrap menu items in a <div>
This avoids styling issues where ui-state-focus rules apply to submenus. Fixes #10162 Closes jquerygh-1342
1 parent 3002d46 commit de2ef2a

File tree

13 files changed

+543
-435
lines changed

13 files changed

+543
-435
lines changed

‎demos/menu/categories.html

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@
2525
<body>
2626

2727
<ul id="menu">
28-
<li class="ui-widget-header">Category 1</li>
29-
<li>Option 1</li>
30-
<li>Option 2</li>
31-
<li>Option 3</li>
32-
<li class="ui-widget-header">Category 2</li>
33-
<li>Option 4</li>
34-
<li>Option 5</li>
35-
<li>Option 6</li>
28+
<li class="ui-widget-header"><div>Category 1</div></li>
29+
<li><div>Option 1</div></li>
30+
<li><div>Option 2</div></li>
31+
<li><div>Option 3</div></li>
32+
<li class="ui-widget-header"><div>Category 2</div></li>
33+
<li><div>Option 4</div></li>
34+
<li><div>Option 5</div></li>
35+
<li><div>Option 6</div></li>
3636
</ul>
3737

3838
<div class="demo-description">

‎demos/menu/default.html

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -22,38 +22,38 @@
2222
<body>
2323

2424
<ul id="menu">
25-
<li class="ui-state-disabled">Aberdeen</li>
26-
<li>Ada</li>
27-
<li>Adamsville</li>
28-
<li>Addyston</li>
29-
<li>Delphi
25+
<li class="ui-state-disabled"><div>Aberdeen</div></li>
26+
<li><div>Ada</div></li>
27+
<li><div>Adamsville</div></li>
28+
<li><div>Addyston</div></li>
29+
<li><div>Delphi</div>
3030
<ul>
31-
<li class="ui-state-disabled">Ada</li>
32-
<li>Saarland</li>
33-
<li>Salzburg an der schönen Donau</li>
31+
<li class="ui-state-disabled"><div>Ada</div></li>
32+
<li><div>Saarland</div></li>
33+
<li><div>Salzburg an der schönen Donau</div></li>
3434
</ul>
3535
</li>
36-
<li>Saarland</li>
37-
<li>Salzburg
36+
<li><div>Saarland</div></li>
37+
<li><div>Salzburg</div>
3838
<ul>
39-
<li>Delphi
39+
<li><div>Delphi</div>
4040
<ul>
41-
<li>Ada</li>
42-
<li>Saarland</li>
43-
<li>Salzburg</li>
41+
<li><div>Ada</div></li>
42+
<li><div>Saarland</div></li>
43+
<li><div>Salzburg</div></li>
4444
</ul>
4545
</li>
46-
<li>Delphi
46+
<li><div>Delphi</div>
4747
<ul>
48-
<li>Ada</li>
49-
<li>Saarland</li>
50-
<li>Salzburg</li>
48+
<li><div>Ada</div></li>
49+
<li><div>Saarland</div></li>
50+
<li><div>Salzburg</div></li>
5151
</ul>
5252
</li>
53-
<li>Perch</li>
53+
<li><div>Perch</div></li>
5454
</ul>
5555
</li>
56-
<li class="ui-state-disabled">Amesville</li>
56+
<li class="ui-state-disabled"><div>Amesville</div></li>
5757
</ul>
5858

5959
<div class="demo-description">

‎demos/menu/icons.html

Lines changed: 28 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,20 +22,38 @@
2222
<body>
2323

2424
<ul id="menu">
25-
<li><span class="ui-icon ui-icon-disk"></span>Save</li>
26-
<li><span class="ui-icon ui-icon-zoomin"></span>Zoom In</li>
27-
<li><span class="ui-icon ui-icon-zoomout"></span>Zoom Out</li>
28-
<li class="ui-state-disabled"><span class="ui-icon ui-icon-print"></span>Print...</li>
2925
<li>
30-
Playback
26+
<div><span class="ui-icon ui-icon-disk"></span>Save</div>
27+
</li>
28+
<li>
29+
<div><span class="ui-icon ui-icon-zoomin"></span>Zoom In</div>
30+
</li>
31+
<li>
32+
<div><span class="ui-icon ui-icon-zoomout"></span>Zoom Out</div>
33+
</li>
34+
<li class="ui-state-disabled">
35+
<div><span class="ui-icon ui-icon-print"></span>Print...</div>
36+
</li>
37+
<li>
38+
<div>Playback</div>
3139
<ul>
32-
<li><span class="ui-icon ui-icon-seek-start"></span>Prev</li>
33-
<li><span class="ui-icon ui-icon-stop"></span>Stop</li>
34-
<li><span class="ui-icon ui-icon-play"></span>Play</li>
35-
<li><span class="ui-icon ui-icon-seek-end"></span>Next</li>
40+
<li>
41+
<div><span class="ui-icon ui-icon-seek-start"></span>Prev</div>
42+
</li>
43+
<li>
44+
<div><span class="ui-icon ui-icon-stop"></span>Stop</div>
45+
</li>
46+
<li>
47+
<div><span class="ui-icon ui-icon-play"></span>Play</div>
48+
</li>
49+
<li>
50+
<div><span class="ui-icon ui-icon-seek-end"></span>Next</div>
51+
</li>
3652
</ul>
3753
</li>
38-
<li>Learn more about this menu</li>
54+
<li>
55+
<div>Learn more about this menu</div>
56+
</li>
3957
</ul>
4058

4159
<div class="demo-description">

0 commit comments

Comments
 (0)