Menu demos: Restrict selectors to demo elements; add menu to demos/index.html

diff --git a/demos/index.html b/demos/index.html
index db3e2bf836fa91778dd25ea3a13b12fcc5265175..6d14ee6bdb647e7162f3081b6bc6df8ae90cd56f 100644 (file)
--- 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 1c4a6ddd4fbaecf8bf3acf7785d8056f640f4fb5..682d016dcf9ade8f78bcd39a06c1802a84361610 100644 (file)
--- 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 6a2cb52808ffeb2812805126fffec83595c5ba88..d7de32a36672a22f881bbc52fa072f24f47a64ab 100644 (file)
--- 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>