Menu: Remove stupid demos, add an icons demo, improve the default demo

jquery · Oct 23, 2012 · 568aec6 · 568aec6
1 parent f4b3cd5
commit 568aec6
Show file tree

Hide file tree

Showing 5 changed files with 86 additions and 179 deletions.
diff --git a/demos/menu/default.html b/demos/menu/default.html
@@ -7,36 +7,61 @@
 	<script src="../../jquery-1.8.2.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>
 	<link rel="stylesheet" href="../demos.css">
 	<script>
 	$(function() {
 		$( "#menu" ).menu();
 	});
 	</script>
+	<style>
+	.ui-menu { width: 150px; }
+	</style>
 </head>
 <body>
 
 <ul id="menu">
-	<li><a href="#Aberdeen">Aberdeen</a></li>
-	<li><a href="#Ada">Ada</a></li>
-	<li><a href="#Adamsville">Adamsville</a></li>
-	<li><a href="#Addyston">Addyston</a></li>
-	<li><a href="#Adelphi">Adelphi</a></li>
-	<li><a href="#Adena">Adena</a></li>
-	<li><a href="#Adrian">Adrian</a></li>
-	<li><a href="#Akron">Akron</a></li>
-	<li><a href="#Albany">Albany</a></li>
-	<li><a href="#Alexandria">Alexandria</a></li>
-	<li><a href="#Alger">Alger</a></li>
-	<li><a href="#Alledonia">Alledonia</a></li>
-	<li><a href="#Alliance">Alliance</a></li>
-	<li><a href="#Alpha">Alpha</a></li>
-	<li><a href="#Alvada">Alvada</a></li>
+	<li class="ui-state-disabled"><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="#">Delphi</a>
+		<ul>
+			<li class="ui-state-disabled"><a href="#">Ada</a></li>
+			<li><a href="#">Saarland</a></li>
+			<li><a href="#">Salzburg</a></li>
+		</ul>
+	</li>
+	<li><a href="#">Saarland</a></li>
+	<li>
+		<a href="#">Salzburg</a>
+		<ul>
+			<li>
+				<a href="#">Delphi</a>
+				<ul>
+					<li><a href="#">Ada</a></li>
+					<li><a href="#">Saarland</a></li>
+					<li><a href="#">Salzburg</a></li>
+				</ul>
+			</li>
+			<li>
+				<a href="#">Delphi</a>
+				<ul>
+					<li><a href="#">Ada</a></li>
+					<li><a href="#">Saarland</a></li>
+					<li><a href="#">Salzburg</a></li>
+				</ul>
+			</li>
+			<li><a href="#">Perch</a></li>
+		</ul>
+	</li>
+	<li class="ui-state-disabled"><a href="#">Amesville</a></li>
 </ul>
 
 <div class="demo-description">
-<p>A menu with the default configuration. A list is transformed, adding theming, mouse and keyboard navigation support. Try to tab to the menu then use the cursor keys to navigate.</p>
+<p>A menu with the default configuration, disabled items and nested menus. A list is transformed, adding theming, mouse and keyboard navigation support. Try to tab to the menu then use the cursor keys to navigate.</p>
 </div>
 </body>
 </html>
diff --git a/demos/menu/icons.html b/demos/menu/icons.html
@@ -0,0 +1,44 @@
+<!doctype html>
+<html lang="en">
+<head>
+	<meta charset="utf-8">
+	<title>jQuery UI Menu - Icons</title>
+	<link rel="stylesheet" href="../../themes/base/jquery.ui.all.css">
+	<script src="../../jquery-1.8.2.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>
+	<link rel="stylesheet" href="../demos.css">
+	<script>
+	$(function() {
+		$( "#menu" ).menu();
+	});
+	</script>
+	<style>
+	.ui-menu { width: 150px; }
+	</style>
+</head>
+<body>
+
+<ul id="menu">
+	<li><a href="#"><span class="ui-icon ui-icon-disk"></span>Save</a></li>
+	<li><a href="#"><span class="ui-icon ui-icon-zoomin"></span>Zoom In</a></li>
+	<li><a href="#"><span class="ui-icon ui-icon-zoomout"></span>Zoom Out</a></li>
+	<li class="ui-state-disabled"><a href="#"><span class="ui-icon ui-icon-print"></span>Print...</a></li>
+	<li>
+		<a href="#">Playback</a>
+		<ul>
+			<li><a href="#"><span class="ui-icon ui-icon-seek-first"></span>Prev</a></li>
+			<li><a href="#"><span class="ui-icon ui-icon-stop"></span>Stop</a></li>
+			<li><a href="#"><span class="ui-icon ui-icon-play"></span>Play</a></li>
+			<li><a href="#"><span class="ui-icon ui-icon-seek-end"></span>Next</a></li>
+		</ul>
+	</li>
+</ul>
+
+<div class="demo-description">
+<p>A menu with the default configuration, showing how to use a menu with icons.</p>
+</div>
+</body>
+</html>
diff --git a/demos/menu/index.html b/demos/menu/index.html
@@ -8,8 +8,7 @@
 
 <ul>
 	<li><a href="default.html">Default functionality</a></li>
-	<li><a href="topalignmenu.html">Top-aligned sub menus</a></li>
-	<li><a href="navigationmenu.html">Navigation menu</a></li>
+	<li><a href="icons.html">Icons</a></li>
 </ul>
 
 </body>

diff --git a/demos/menu/navigationmenu.html b/demos/menu/navigationmenu.html
diff --git a/demos/menu/topalignmenu.html b/demos/menu/topalignmenu.html