Skip to content
Permalink
Browse files

Merge remote branch 'origin/menu'

Conflicts:
	demos/autocomplete/categories.html
	demos/autocomplete/combobox.html
	demos/autocomplete/custom-data.html
	demos/autocomplete/default.html
	demos/autocomplete/folding.html
	demos/autocomplete/multiple-remote.html
	demos/autocomplete/multiple.html
	demos/autocomplete/remote-jsonp.html
	demos/autocomplete/remote-with-cache.html
	demos/autocomplete/remote.html
	demos/autocomplete/xml.html
	demos/button/splitbutton.html
	demos/index.html
	tests/visual/menu/nested.html
	themes/base/jquery.ui.autocomplete.css
	ui/jquery.ui.autocomplete.js
  • Loading branch information
jzaefferer committed Dec 22, 2010
2 parents 8d39171 + 70e8e9f commit 3552947c19b8ea1b779dc9809783c6ac6a218d68
Showing with 848 additions and 325 deletions.
  1. +1 −0 demos/autocomplete/categories.html
  2. +1 −0 demos/autocomplete/combobox.html
  3. +1 −0 demos/autocomplete/custom-data.html
  4. +1 −0 demos/autocomplete/default.html
  5. +1 −0 demos/autocomplete/folding.html
  6. +2 −0 demos/autocomplete/multiple-remote.html
  7. +1 −0 demos/autocomplete/multiple.html
  8. +1 −0 demos/autocomplete/remote-jsonp.html
  9. +1 −0 demos/autocomplete/remote-with-cache.html
  10. +1 −0 demos/autocomplete/remote.html
  11. +1 −0 demos/autocomplete/xml.html
  12. +41 −18 demos/button/splitbutton.html
  13. +2 −0 demos/index.html
  14. +82 −0 demos/menu/contextmenu.html
  15. +54 −0 demos/menu/default.html
  16. +17 −0 demos/menu/index.html
  17. +2 −0 tests/static/index.html
  18. +1 −0 tests/unit/index.html
  19. +74 −0 tests/unit/menu/menu.html
  20. +32 −0 tests/unit/menu/menu_core.js
  21. +11 −0 tests/unit/menu/menu_defaults.js
  22. +24 −0 tests/unit/menu/menu_events.js
  23. +19 −0 tests/unit/menu/menu_methods.js
  24. +10 −0 tests/unit/menu/menu_options.js
  25. +8 −0 tests/unit/menu/menu_tickets.js
  26. +1 −0 tests/visual/all.html
  27. +1 −0 tests/visual/autocomplete/autocomplete.html
  28. +1 −1 tests/visual/compound/widgets_in_dialog.html
  29. +8 −0 tests/visual/index.html
  30. +19 −36 tests/visual/menu/contextmenu.html
  31. +13 −4 tests/visual/menu/drilldown.html
  32. +24 −36 tests/visual/menu/menu.html
  33. +94 −0 tests/visual/menu/menubar.html
  34. +6 −4 tests/visual/menu/nested.html
  35. +1 −1 tests/visual/position/position.html
  36. +0 −40 themes/base/jquery.ui.autocomplete.css
  37. +1 −0 themes/base/jquery.ui.base.css
  38. +37 −0 themes/base/jquery.ui.menu.css
  39. +4 −185 ui/jquery.ui.autocomplete.js
  40. +249 −0 ui/jquery.ui.menu.js
@@ -8,6 +8,7 @@
<script src="../../ui/jquery.ui.core.js"></script>
<script src="../../ui/jquery.ui.widget.js"></script>
<script src="../../ui/jquery.ui.position.js"></script>
<script src="../../ui/jquery.ui.menu.js"></script>
<script src="../../ui/jquery.ui.autocomplete.js"></script>
<link rel="stylesheet" href="../demos.css">
<style>
@@ -9,6 +9,7 @@
<script src="../../ui/jquery.ui.widget.js"></script>
<script src="../../ui/jquery.ui.button.js"></script>
<script src="../../ui/jquery.ui.position.js"></script>
<script src="../../ui/jquery.ui.menu.js"></script>
<script src="../../ui/jquery.ui.autocomplete.js"></script>
<link rel="stylesheet" href="../demos.css">
<style>
@@ -8,6 +8,7 @@
<script src="../../ui/jquery.ui.core.js"></script>
<script src="../../ui/jquery.ui.widget.js"></script>
<script src="../../ui/jquery.ui.position.js"></script>
<script src="../../ui/jquery.ui.menu.js"></script>
<script src="../../ui/jquery.ui.autocomplete.js"></script>
<link rel="stylesheet" href="../demos.css">
<style>
@@ -8,6 +8,7 @@
<script src="../../ui/jquery.ui.core.js"></script>
<script src="../../ui/jquery.ui.widget.js"></script>
<script src="../../ui/jquery.ui.position.js"></script>
<script src="../../ui/jquery.ui.menu.js"></script>
<script src="../../ui/jquery.ui.autocomplete.js"></script>
<link rel="stylesheet" href="../demos.css">
<script>
@@ -8,6 +8,7 @@
<script src="../../ui/jquery.ui.core.js"></script>
<script src="../../ui/jquery.ui.widget.js"></script>
<script src="../../ui/jquery.ui.position.js"></script>
<script src="../../ui/jquery.ui.menu.js"></script>
<script src="../../ui/jquery.ui.autocomplete.js"></script>
<link rel="stylesheet" href="../demos.css">
<script>
@@ -1,13 +1,15 @@
<!DOCTYPE html>
<html lang="en">
<head>
<<<<<<< HEAD
<meta charset="utf-8">
<title>jQuery UI Autocomplete - Multiple, remote</title>
<link rel="stylesheet" href="../../themes/base/jquery.ui.all.css">
<script src="../../jquery-1.4.4.js"></script>
<script src="../../ui/jquery.ui.core.js"></script>
<script src="../../ui/jquery.ui.widget.js"></script>
<script src="../../ui/jquery.ui.position.js"></script>
<script src="../../ui/jquery.ui.menu.js"></script>
<script src="../../ui/jquery.ui.autocomplete.js"></script>
<link rel="stylesheet" href="../demos.css">
<style>
@@ -8,6 +8,7 @@
<script src="../../ui/jquery.ui.core.js"></script>
<script src="../../ui/jquery.ui.widget.js"></script>
<script src="../../ui/jquery.ui.position.js"></script>
<script src="../../ui/jquery.ui.menu.js"></script>
<script src="../../ui/jquery.ui.autocomplete.js"></script>
<link rel="stylesheet" href="../demos.css">
<script>
@@ -8,6 +8,7 @@
<script src="../../ui/jquery.ui.core.js"></script>
<script src="../../ui/jquery.ui.widget.js"></script>
<script src="../../ui/jquery.ui.position.js"></script>
<script src="../../ui/jquery.ui.menu.js"></script>
<script src="../../ui/jquery.ui.autocomplete.js"></script>
<link rel="stylesheet" href="../demos.css">
<style>
@@ -8,6 +8,7 @@
<script src="../../ui/jquery.ui.core.js"></script>
<script src="../../ui/jquery.ui.widget.js"></script>
<script src="../../ui/jquery.ui.position.js"></script>
<script src="../../ui/jquery.ui.menu.js"></script>
<script src="../../ui/jquery.ui.autocomplete.js"></script>
<link rel="stylesheet" href="../demos.css">
<style>
@@ -8,6 +8,7 @@
<script src="../../ui/jquery.ui.core.js"></script>
<script src="../../ui/jquery.ui.widget.js"></script>
<script src="../../ui/jquery.ui.position.js"></script>
<script src="../../ui/jquery.ui.menu.js"></script>
<script src="../../ui/jquery.ui.autocomplete.js"></script>
<link rel="stylesheet" href="../demos.css">
<style>
@@ -8,6 +8,7 @@
<script src="../../ui/jquery.ui.core.js"></script>
<script src="../../ui/jquery.ui.widget.js"></script>
<script src="../../ui/jquery.ui.position.js"></script>
<script src="../../ui/jquery.ui.menu.js"></script>
<script src="../../ui/jquery.ui.autocomplete.js"></script>
<link rel="stylesheet" href="../demos.css">
<style>
@@ -8,6 +8,8 @@
<script src="../../ui/jquery.ui.core.js"></script>
<script src="../../ui/jquery.ui.widget.js"></script>
<script src="../../ui/jquery.ui.button.js"></script>
<script src="../../ui/jquery.ui.position.js"></script>
<script src="../../ui/jquery.ui.menu.js"></script>
<link rel="stylesheet" href="../demos.css">
<script>
$(function() {
@@ -16,39 +18,60 @@
.click(function() {
alert( "Running the last action" );
})
.next()
.button( {
text: false,
icons: {
primary: "ui-icon-triangle-1-s"
}
})
.click(function() {
alert( "Could display a menu to select an action" );
})
.parent()
.buttonset();
.next()
.button( {
text: false,
icons: {
primary: "ui-icon-triangle-1-s"
}
})
.click( function() {
var menu = $(this).parent().next().show().position({
my: "left top",
at: "left bottom",
of: this
});
$(document).one("click", function() {
menu.hide();
});
return false;
})
.parent()
.buttonset()
.next()
.hide()
.menu();
});
</script>
<style>
.ui-menu { position: absolute; width: 100px; }
</style>
</head>
<body>

<div class="demo">

<div>
<button id="rerun">Run last action</button>
<button id="select">Select an action</button>
</div>
<div>
<div>
<button id="rerun">Run last action</button>
<button id="select">Select an action</button>
</div>
<ul>
<li><a href="#">Open...</a></li>
<li><a href="#">Save</a></li>
<li><a href="#">Delete</a></li>
</ul>
</div>

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



<div class="demo-description">
<p>An example of a split button built with two buttons: A plan button with just text, one with only a primary icon and no text. Both are grouped together in a set.</p>

<p>An example of a split button built with two buttons: A plain button with just text, one with only a primary icon
and no text. Both are grouped together in a set.</p>

</div><!-- End demo-description -->

</body>
@@ -19,6 +19,7 @@
<script src="../ui/jquery.ui.dialog.js"></script>
<script src="../ui/jquery.ui.draggable.js"></script>
<script src="../ui/jquery.ui.droppable.js"></script>
<script src="../ui/jquery.ui.menu.js"></script>
<script src="../ui/jquery.ui.position.js"></script>
<script src="../ui/jquery.ui.progressbar.js"></script>
<script src="../ui/jquery.ui.resizable.js"></script>
@@ -270,6 +271,7 @@
<dd><a href="button/index.html">Button</a></dd>
<dd><a href="datepicker/index.html">Datepicker</a></dd>
<dd><a href="dialog/index.html">Dialog</a></dd>
<dd><a href="menu/index.html">Menu</a></dd>
<dd><a href="progressbar/index.html">Progressbar</a></dd>
<dd><a href="slider/index.html">Slider</a></dd>
<dd><a href="spinner/index.html">Spinner</a></dd>
@@ -0,0 +1,82 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<title>jQuery UI Menu - Contextmenu demo</title>
<link type="text/css" href="../../themes/base/jquery.ui.all.css" rel="stylesheet" />
<script type="text/javascript" src="../../jquery-1.4.2.js"></script>
<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
<script type="text/javascript" src="../../ui/jquery.ui.position.js"></script>
<script type="text/javascript" src="../../ui/jquery.ui.widget.js"></script>
<script type="text/javascript" src="../../ui/jquery.ui.menu.js"></script>
<script type="text/javascript" src="../../ui/jquery.ui.button.js"></script>
<link type="text/css" href="../demos.css" rel="stylesheet" />
<script type="text/javascript">
$(function() {
$(".demo button").button({
icons: {
primary: "ui-icon-home",
secondary: "ui-icon-triangle-1-s"
}
}).each(function() {
$(this).next().menu({
select: function(event, ui) {
$(this).hide();
$("#log").append("<div>Selected " + ui.item.text() + "</div>");
},
input: $(this)
}).hide();
}).click(function(event) {
var menu = $(this).next();
if (menu.is(":visible")) {
menu.hide();
return false;
}
menu.menu("deactivate").show().css({top:0, left:0}).position({
my: "left top",
at: "right top",
of: this
});
$(document).one("click", function() {
menu.hide();
});
return false;
})
});
</script>
<style>
.ui-menu { width: 200px; position: absolute; }
</style>
</head>
<body>

<div class="demo">

<button>Select a city</button>
<ul>
<li><a href="#">Amsterdam</a></li>
<li><a href="#">Anaheim</a></li>
<li><a href="#">Cologne</a></li>
<li><a href="#">Frankfurt</a></li>
<li><a href="#">Magdeburg</a></li>
<li><a href="#">Munich</a></li>
<li><a href="#">Utrecht</a></li>
<li><a href="#">Zurich</a></li>
</ul>

<div id="log"></div>

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

<div class="demo-description">

<p>A simple contextmenu: Click the button, or tab to it and hit space to open the menu. Use the mouse or cursor keys to select an item, click it or hit enter to select it.</p>

<p>The keyboard handling is part of the menu. Using the input option to menu is configured to add the key event handlers to the button, as that button gets focused when clicked.</p>

</div><!-- End demo-description -->



</body>
</html>
@@ -0,0 +1,54 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<title>jQuery UI Menu - Default demo</title>
<link type="text/css" href="../../themes/base/jquery.ui.all.css" rel="stylesheet" />
<script type="text/javascript" src="../../jquery-1.4.2.js"></script>
<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
<script type="text/javascript" src="../../ui/jquery.ui.widget.js"></script>
<script type="text/javascript" src="../../ui/jquery.ui.menu.js"></script>
<link type="text/css" href="../demos.css" rel="stylesheet" />
<script type="text/javascript">
$(function() {
$(".demo ul").menu();
});
</script>
<style>
</style>
</head>
<body>

<div class="demo">

<ul>
<li><a href="#">Aberdeen</a></li>
<li><a href="#">Ada</a></li>
<li><a href="#">Adamsville</a></li>
<li><a href="#">Addyston</a></li>
<li><a href="#">Adelphi</a></li>
<li><a href="#">Adena</a></li>
<li><a href="#">Adrian</a></li>
<li><a href="#">Akron</a></li>
<li><a href="#">Albany</a></li>
<li><a href="#">Alexandria</a></li>
<li><a href="#">Alger</a></li>
<li><a href="#">Alledonia</a></li>
<li><a href="#">Alliance</a></li>
<li><a href="#">Alpha</a></li>
<li><a href="#">Alvada</a></li>
</ul>

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

<div class="demo-description">

<p>A menu with the default configuration. A list is transformed, adding themeing, mouse and keyboard navigation support. Try to tab to the menu and use the cursor keys to navigate.</p>

</div><!-- End demo-description -->



</body>
</html>
@@ -0,0 +1,17 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<title>jQuery UI Menu Demos</title>
<link type="text/css" href="../demos.css" rel="stylesheet" />
</head>
<body>
<div class="demos-nav">
<h4>Examples</h4>
<ul>
<li class="demo-config-on"><a href="default.html">Default functionality</a></li>
<li><a href="contextmenu.html">Contextmenu</a></li>
</ul>
</div>
</body>
</html>
@@ -32,6 +32,8 @@ <h2>Widgets</h2>
<li><a href="button/default.html">Button</a></li>
<li><a href="datepicker/default.html">Datepicker</a></li>
<li><a href="dialog/default.html">Dialog</a></li>
<li><a href="menu/default.html">Menu</a></li>
<li><a href="menu/all-menus-icons.html">Menu with icons</a></li>
<li><a href="progressbar/default.html">Progressbar</a></li>
<li><a href="slider/default.html">Slider</a></li>
<li><a href="tabs/default.html">Tabs</a></li>
@@ -24,6 +24,7 @@
<script type="text/javascript" src="../../ui/jquery.ui.widget.js"></script>
<script type="text/javascript" src="../../ui/jquery.ui.mouse.js"></script>
<script type="text/javascript" src="../../ui/jquery.ui.accordion.js"></script>
<script type="text/javascript" src="../../ui/jquery.ui.menu.js"></script>
<script type="text/javascript" src="../../ui/jquery.ui.autocomplete.js"></script>
<script type="text/javascript" src="../../ui/jquery.ui.button.js"></script>
<script type="text/javascript" src="../../ui/jquery.ui.datepicker.js"></script>

0 comments on commit 3552947

Please sign in to comment.
You can’t perform that action at this time.