Skip to content

Commit fe5248b

Browse files
committed
Merge branch 'menu' into devpreview
Conflicts: demos/button/splitbutton.html
2 parents b02b8e3 + ecc0d0e commit fe5248b

File tree

3 files changed

+156
-128
lines changed

3 files changed

+156
-128
lines changed

demos/button/splitbutton.html

Lines changed: 29 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
<script src="../../ui/jquery.ui.core.js"></script>
99
<script src="../../ui/jquery.ui.widget.js"></script>
1010
<script src="../../ui/jquery.ui.button.js"></script>
11+
<script src="../../ui/jquery.ui.position.js"></script>
12+
<script src="../../ui/jquery.ui.menu.js"></script>
1113
<link rel="stylesheet" href="../demos.css">
1214
<script>
1315
$(function() {
@@ -23,25 +25,43 @@
2325
primary: "ui-icon-triangle-1-s"
2426
}
2527
})
26-
.click(function() {
27-
alert( "Could display a menu to select an action" );
28+
.click( function() {
29+
var menu = $(this).parent().next().show().position({
30+
my: "left top",
31+
at: "left bottom",
32+
of: this
33+
});
34+
$(document).one("click", function() {
35+
menu.hide();
36+
});
37+
return false;
2838
})
29-
.parent()
30-
.buttonset();
39+
.parent()
40+
.buttonset()
41+
.next()
42+
.hide()
43+
.menu();
3144
});
3245
</script>
3346
<style>
34-
47+
.ui-menu { position: absolute; width: 100px; }
3548
</style>
3649
</head>
3750
<body>
3851

3952
<div class="demo">
4053

41-
<div>
42-
<button id="rerun">Run last action</button>
43-
<button id="select">Select an action</button>
44-
</div>
54+
<div>
55+
<div>
56+
<button id="rerun">Run last action</button>
57+
<button id="select">Select an action</button>
58+
</div>
59+
<ul>
60+
<li><a href="#">Open...</a></li>
61+
<li><a href="#">Save</a></li>
62+
<li><a href="#">Delete</a></li>
63+
</ul>
64+
</div>
4565

4666
</div><!-- End demo -->
4767

tests/visual/menu/menu.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
99
<script type="text/javascript" src="../../../ui/jquery.ui.widget.js"></script>
1010
<script type="text/javascript" src="../../../ui/jquery.ui.menu.js"></script>
11-
<script type="text/javascript" src="http://jqueryui.com/themeroller/themeswitchertool/"></script>
1211
<script type="text/javascript">
1312
$(function() {
1413
$.fn.themeswitcher && $('<div/>').css({

0 commit comments

Comments
 (0)