Skip to content
Permalink
Browse files

Merge remote branch 'kborchers/menubar-autoExpand'

  • Loading branch information
jzaefferer committed Jul 10, 2011
2 parents 0245b72 + 40aa8f5 commit 954419f94e5df411e9c52adaf51d60dc2903b7d2
Showing with 23 additions and 1 deletion.
  1. +1 −0 demos/menubar/default.html
  2. +22 −1 ui/jquery.ui.menubar.js
@@ -23,6 +23,7 @@
});

$(".menubar-icons").menubar({
autoExpand: true,
menuIcon: true,
buttons: true,
position: {
@@ -20,6 +20,7 @@
$.widget( "ui.menubar", {
version: "@VERSION",
options: {
autoExpand: false,
buttons: false,
menuIcon: false,
position: {
@@ -89,7 +90,11 @@ $.widget( "ui.menubar", {
that._close();
return;
}
if ( ( that.open && event.type == "mouseenter" ) || event.type == "click" ) {
if ( ( that.open && event.type == "mouseenter" ) || event.type == "click" || that.options.autoExpand ) {
if( that.options.autoExpand ) {
clearTimeout( that.timer );
}

that._open( event, menu );
}
})
@@ -115,6 +120,22 @@ $.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() {
that._close();
}, 150 );
});
menu.bind( "mouseleave.menubar", function( event ) {
that.timer = setTimeout( function() {
that._close();
}, 150 );
})
.bind( "mouseenter.menubar", function( event ) {
clearTimeout( that.timer );
});
}

// TODO review if these options are a good choice, maybe they can be merged
if ( that.options.menuIcon ) {

0 comments on commit 954419f

Please sign in to comment.
You can’t perform that action at this time.