aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjzaefferer <joern.zaefferer@gmail.com>2010-06-19 16:37:39 +0200
committerjzaefferer <joern.zaefferer@gmail.com>2010-06-19 16:37:39 +0200
commitfa27e0f6117557d978346b19786c261d76e2e8bd (patch)
treed1a3ba9f4d509ea51a14293ef710e604444a415c
parent9ac357813f9164c926b8533a16cc163d3cbf0693 (diff)
downloadjquery-ui-fa27e0f6117557d978346b19786c261d76e2e8bd.tar.gz
jquery-ui-fa27e0f6117557d978346b19786c261d76e2e8bd.zip
Menu demos: Restrict selectors to demo elements; add menu to demos/index.html
-rw-r--r--demos/index.html2
-rw-r--r--demos/menu/contextmenu.html8
-rw-r--r--demos/menu/default.html2
3 files changed, 10 insertions, 2 deletions
diff --git a/demos/index.html b/demos/index.html
index db3e2bf83..6d14ee6bd 100644
--- a/demos/index.html
+++ b/demos/index.html
@@ -18,6 +18,7 @@
<script type="text/javascript" src="../ui/jquery.ui.dialog.js"></script>
<script type="text/javascript" src="../ui/jquery.ui.draggable.js"></script>
<script type="text/javascript" src="../ui/jquery.ui.droppable.js"></script>
+ <script type="text/javascript" src="../ui/jquery.ui.menu.js"></script>
<script type="text/javascript" src="../ui/jquery.ui.position.js"></script>
<script type="text/javascript" src="../ui/jquery.ui.progressbar.js"></script>
<script type="text/javascript" src="../ui/jquery.ui.resizable.js"></script>
@@ -265,6 +266,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="tabs/index.html">Tabs</a></dd>
diff --git a/demos/menu/contextmenu.html b/demos/menu/contextmenu.html
index 1c4a6ddd4..682d016dc 100644
--- a/demos/menu/contextmenu.html
+++ b/demos/menu/contextmenu.html
@@ -9,10 +9,16 @@
<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() {
- $("button").each(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();
diff --git a/demos/menu/default.html b/demos/menu/default.html
index 6a2cb5280..d7de32a36 100644
--- a/demos/menu/default.html
+++ b/demos/menu/default.html
@@ -11,7 +11,7 @@
<link type="text/css" href="../demos.css" rel="stylesheet" />
<script type="text/javascript">
$(function() {
- $("ul").menu();
+ $(".demo ul").menu();
});
</script>
<style>