From: Jörn Zaefferer <joern.zaefferer@gmail.com>
Date: Wed, 13 Jul 2011 15:03:25 +0000 (-0400)
Subject: Menubar: Trigger select event after running all other methods. Allows the select... 
X-Git-Tag: 1.9m6~98^2~7
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=7856b264a297d78762f599611580804b92afd1c0;p=jquery-ui.git

Menubar: Trigger select event after running all other methods. Allows the select-handler to destroy the widget without errors.
---

diff --git a/demos/menubar/default.html b/demos/menubar/default.html
index 6bd67b64a..adee4afc9 100644
--- a/demos/menubar/default.html
+++ b/demos/menubar/default.html
@@ -13,13 +13,17 @@
 	<script src="../../ui/jquery.ui.menubar.js"></script>
 	<script>
 	$(function() {
+		function select(event, ui) {
+			$("<div/>").text("Selected: " + ui.item.text()).appendTo("#log");
+			if (ui.item.text() == 'Quit') {
+				$(this).menubar('destroy');
+			}
+		}
 		$("#bar1").menubar({
 			position: {
 				within: $("#demo-frame").add(window).first()
 			},
-			select: function(event, ui) {
-				$("<div/>").text("Selected: " + ui.item.text()).appendTo("#log");
-			}
+			select: select
 		});
 
 		$(".menubar-icons").menubar({
@@ -29,9 +33,7 @@
 			position: {
 				within: $("#demo-frame").add(window).first()
 			},
-			select: function(event, ui) {
-				$("<div/>").text("Selected: " + ui.item.text()).appendTo("#log");
-			}
+			select: select
 		});
 	});
 	</script>
diff --git a/ui/jquery.ui.menubar.js b/ui/jquery.ui.menubar.js
index 3df6d9a53..e28ea3e3c 100644
--- a/ui/jquery.ui.menubar.js
+++ b/ui/jquery.ui.menubar.js
@@ -49,10 +49,10 @@ $.widget( "ui.menubar", {
 				},
 				select: function( event, ui ) {
 					ui.item.parents( "ul.ui-menu:last" ).hide();
-					that._trigger( "select", event, ui );
 					that._close();
 					// TODO what is this targetting? there's probably a better way to access it
 					$(event.target).prev().focus();
+					that._trigger( "select", event, ui );
 				}
 			})
 			.hide()
@@ -94,7 +94,7 @@ $.widget( "ui.menubar", {
 					if( that.options.autoExpand ) {
 						clearTimeout( that.timer );
 					}
-					
+
 					that._open( event, menu );
 				}
 			})
@@ -120,7 +120,7 @@ $.widget( "ui.menubar", {
 			.attr( "role", "menuitem" )
 			.attr( "aria-haspopup", "true" )
 			.wrapInner( "<span class='ui-button-text'></span>" );
-			
+
 			if ( that.options.autoExpand ) {
 				input.bind( "mouseleave.menubar", function( event ) {
 					that.timer = setTimeout( function() {