Skip to content
Permalink
Browse files

Merge branch 'master' of github.com:jquery/jquery-ui

  • Loading branch information
jzaefferer committed Mar 20, 2010
2 parents d4ad2cb + 0e24849 commit 64f6bfae3a37cae9cc1ddcb77866669021202cb6
Showing with 7 additions and 7 deletions.
  1. +7 −7 ui/jquery.ui.autocomplete.js
@@ -60,7 +60,7 @@ $.widget( "ui.autocomplete", {
if ( !self.menu.active ) {
return;
}
self.menu.select();
self.menu.select( event );
break;
case keyCode.ESCAPE:
self.element.val( self.term );
@@ -334,13 +334,13 @@ $.widget("ui.menu", {
role: "listbox",
"aria-activedescendant": "ui-active-menuitem"
})
.click(function(e) {
if ( !$( e.target ).closest( ".ui-menu-item" ).length ) {
.click(function( event ) {
if ( !$( event.target ).closest( ".ui-menu-item" ).length ) {
return;
}
// temporary
e.preventDefault();
self.select();
event.preventDefault();
self.select( event );
});
this.refresh();
},
@@ -481,8 +481,8 @@ $.widget("ui.menu", {
return this.element.height() < this.element.attr("scrollHeight");
},

select: function() {
this._trigger("selected", null, { item: this.active });
select: function( event ) {
this._trigger("selected", event, { item: this.active });
}
});

0 comments on commit 64f6bfa

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