From 3c258bfa3ceab51b7e4c847f1196bd64f6c40cee Mon Sep 17 00:00:00 2001
From: Hans Hillen <hans.hillen@gmail.com>
Date: Wed, 19 Oct 2011 11:41:33 +0200
Subject: Rewrite popup/menu interaction to make popup managed by menu (adds
 trigger option to menu). Makes popup agnostic of menu and allows datepicker
 to use popup (soon).

---
 demos/popup/popup-menu.html | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

(limited to 'demos/popup')

diff --git a/demos/popup/popup-menu.html b/demos/popup/popup-menu.html
index ddcef4957..8041e2fa3 100644
--- a/demos/popup/popup-menu.html
+++ b/demos/popup/popup-menu.html
@@ -16,16 +16,13 @@
 		function log( msg ) {
 			$( "<div/>" ).text( msg ).appendTo( "#log" );
 		}
-		var selected = {
-			select: function( event, ui ) {
-				log( "Selected: " + ui.item.text() );
-				$(this).popup("close");
-			}
-		};
+		var selected = function( event, ui ) {
+			log( "Selected: " + ui.item.text() );
+			$(this).popup( "close" );
+		}
+
+		$("#button1").button().next().menu( {select: selected, trigger: $("#button1")} );
 
-		$("#button1").button()
-			.next().menu(selected).popup();
-		
 		$( "#rerun" )
 			.button()
 			.click(function() {
@@ -39,10 +36,7 @@
 					}
 				})
 				.next()
-					.menu(selected)
-					.popup({
-						trigger: $("#select")
-					})
+					.menu( {select: selected, trigger: $("#select")} )
 				.parent()
 					.buttonset({
 						items: "button"
@@ -69,8 +63,8 @@
 		<li><a href="#">Utrecht</a></li>
 		<li><a href="#">Zurich</a></li>
 	</ul>
-	
-	
+
+
 	<div>
 		<div>
 			<button id="rerun">Run last action</button>
-- 
cgit v1.2.3