Skip to content
Permalink
Browse files

Merge remote branch 'kborchers/bug_7024'

  • Loading branch information...
jzaefferer committed May 10, 2011
2 parents 1a97410 + 73ed738 commit c844bbd2edd4c5d822bc72394bce64af0952c76e
Showing with 4 additions and 1 deletion.
  1. +1 −0 ui/jquery.ui.autocomplete.js
  2. +3 −1 ui/jquery.ui.menu.js
@@ -338,6 +338,7 @@ $.widget( "ui.autocomplete", {
this.menu.element.hide();
this.menu.blur();
this._trigger( "close", event );
this.menu.isNewMenu = true;
}
},

@@ -18,6 +18,7 @@ var idIncrement = 0;
$.widget("ui.menu", {
defaultElement: "<ul>",
delay: 150,
isNewMenu: true,
options: {
position: {
my: "left top",
@@ -54,7 +55,8 @@ $.widget("ui.menu", {
self.select( event );
})
.bind( "mouseover.menu", function( event ) {
if ( self.options.disabled ) {
if ( self.options.disabled || self.isNewMenu ) {
self.isNewMenu = false;
return;
}
var target = $( event.target ).closest( ".ui-menu-item" );

0 comments on commit c844bbd

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