Skip to content

Commit 0ddf677

Browse files
jzaeffererjzaefferer
committed
Menu: Integrated flyoutmenu into menu, and moved flyoutmenu.html
testmenu into contextmenu.html
1 parent 38cfcff commit 0ddf677

File tree

6 files changed

+169
-259
lines changed

6 files changed

+169
-259
lines changed

‎tests/visual/menu/contextmenu.html

Lines changed: 69 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,23 +20,36 @@
2020
top: 10
2121
}).appendTo(document.body).themeswitcher();
2222

23+
// TODO close other menus when opening a new one
2324
$("button").each(function() {
2425
$(this).next().menu({
26+
/* top-alignment
27+
position: function(item) {
28+
return {
29+
my: "left top",
30+
at: "right top",
31+
of: item.parent()
32+
}
33+
},
34+
*/
2535
select: function(event, ui) {
2636
$(this).hide().prev().focus();
2737
$("#log").append("<div>Selected " + ui.item.text() + "</div>");
2838
}
2939
}).hide();
40+
41+
// equal height
42+
//menu.find("ul").height(menu.height());
3043
}).click(function(event) {
31-
// TODO required to prevent the click handler below from handling this event
44+
// required to prevent the click handler below from handling this event
3245
event.stopPropagation();
3346
var menu = $("#menu" + this.id).menu("blur").show().position({
3447
my: "left top",
3548
at: "right top",
3649
of: event.pageX > 0 ? event : this
3750
}).focus();
3851
$(document).one("click", function() {
39-
menu.hide();
52+
menu.menu("closeAll").menu("widget").hide();
4053
})
4154
}).next().keydown(function(event) {
4255
var menu = $(this).data("menu");
@@ -45,10 +58,14 @@
4558
event.stopPropagation();
4659
switch (event.keyCode) {
4760
case $.ui.keyCode.TAB:
61+
menu.closeAll();
4862
menu.widget().hide();
63+
$(this).prev().focus()
4964
break;
5065
case $.ui.keyCode.ESCAPE:
66+
menu.closeAll();
5167
menu.widget().hide();
68+
$(this).prev().focus()
5269
break;
5370
default:
5471

@@ -59,7 +76,7 @@
5976
<style>
6077
body { font-size:62.5%; }
6178
.ui-menu { width: 200px; position: absolute; }
62-
#menu2 { height: 200px; overflow: auto; }
79+
#menu3 { height: 200px; overflow: auto; }
6380
</style>
6481
</head>
6582
<body>
@@ -76,13 +93,60 @@
7693
<li><a href="#">Zurich</a></li>
7794
</ul>
7895

96+
<button id="2">Show context menu 2</button>
97+
<ul id="menu2">
98+
<li>
99+
<a id="a1" href="#">Amsterdam</a>
100+
<ul>
101+
<li><a id="b1" href="#">Aberdeen</a></li>
102+
<li><a id="b2" href="#">Ada</a></li>
103+
<li>
104+
<a href="#">Adamsville</a>
105+
<ul>
106+
<li><a href="#">Anaheim</a></li>
107+
<li>
108+
<a href="#">Cologne</a>
109+
<ul>
110+
<li><a href="#">Mberdeen</a></li>
111+
<li><a href="#">Mda</a></li>
112+
<li><a href="#">Mdamsville</a></li>
113+
<li><a href="#">Mddyston</a></li>
114+
<li><a href="#">Mmesville</a></li>
115+
</ul>
116+
</li>
117+
<li><a href="#">Frankfurt</a></li>
118+
</ul>
119+
</li>
120+
<li><a href="#">Addyston</a></li>
121+
<li><a href="#">Amesville</a></li>
122+
</ul>
123+
</li>
124+
<li><a id="a2" href="#">Anaheim</a></li>
125+
<li><a id="a3" href="#">Cologne</a></li>
126+
<li><a href="#">Frankfurt</a></li>
127+
<li>
128+
<a href="#">Magdeburg</a>
129+
<ul>
130+
<li><a href="#">Mberdeen</a></li>
131+
<li><a href="#">Mda</a></li>
132+
<li><a href="#">Mdamsville</a></li>
133+
<li><a href="#">Mddyston</a></li>
134+
<li><a href="#">Mmesville</a></li>
135+
</ul>
136+
</li>
137+
<li><a href="#">Munich</a></li>
138+
<li><a href="#">Utrecht</a></li>
139+
<li><a href="#">Zurich</a></li>
140+
</ul>
141+
142+
79143
<div class="ui-widget" style="margin-top:2em; font-family:Arial">
80144
Log:
81145
<div id="log" style="height: 400px; width: 300px; overflow: auto;" class="ui-widget-content"></div>
82146
</div>
83147

84-
<button id="2">Show context menu 2</button>
85-
<ul id="menu2">
148+
<button id="3">Show context menu 3</button>
149+
<ul id="menu3">
86150
<li><a href="#">Aberdeen</a></li>
87151
<li><a href="#">Ada</a></li>
88152
<li><a href="#">Adamsville</a></li>

‎tests/visual/menu/flyoutmenu.html

Lines changed: 0 additions & 127 deletions
This file was deleted.

‎tests/visual/menu/flyoutmenu.js

Lines changed: 0 additions & 110 deletions
This file was deleted.

‎tests/visual/menu/menu.html

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<script type="text/javascript" src="../../../jquery-1.4.4.js"></script>
88
<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
99
<script type="text/javascript" src="../../../ui/jquery.ui.widget.js"></script>
10+
<script type="text/javascript" src="../../../ui/jquery.ui.position.js"></script>
1011
<script type="text/javascript" src="../../../ui/jquery.ui.menu.js"></script>
1112
<script type="text/javascript">
1213
$(function() {
@@ -40,7 +41,7 @@
4041
<style>
4142
body { font-size:62.5%; }
4243
.ui-menu { width: 200px; }
43-
#menu2 { height: 200px; overflow: auto; }
44+
#menu3 { height: 200px; overflow: auto; }
4445
</style>
4546
</head>
4647
<body>
@@ -69,7 +70,14 @@
6970
</ul>
7071
</li>
7172
<li><a href="#">Saarland</a></li>
72-
<li><a href="#">Salzburg</a></li>
73+
<li>
74+
<a href="#">Salzburg</a>
75+
<ul>
76+
<li><a href="#">Alliance</a></li>
77+
<li><a href="#">Krombach</a></li>
78+
<li><a href="#">Perch</a></li>
79+
</ul>
80+
</li>
7381
</ul>
7482

7583
<ul id="menu3">

0 commit comments

Comments
 (0)