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

This commit is contained in:
Jörn Zaefferer 2011-07-13 11:03:25 -04:00
parent 06676f4696
commit 7856b264a2
2 changed files with 11 additions and 9 deletions

View File

@ -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>

View File

@ -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()