Skip to content

Commit

Permalink
Autocomplete: Trigger search timeout on all input events. Fixes #6666…
Browse files Browse the repository at this point in the history
… - keyboard-autorepeat on Firefox and paste event

The input event triggers after all changes to an input field including
paste/cut events.
  • Loading branch information
treyhunner committed May 15, 2011
1 parent 85ac420 commit adb3557
Showing 1 changed file with 25 additions and 10 deletions.
35 changes: 25 additions & 10 deletions ui/jquery.ui.autocomplete.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@ $.widget( "ui.autocomplete", {
_create: function() {
var self = this,
doc = this.element[ 0 ].ownerDocument,
suppressKeyPress;
suppressKeyPress,
suppressInput;

this.valueMethod = this.element[ this.element.is( "input" ) ? "val" : "text" ];

Expand All @@ -63,10 +64,12 @@ $.widget( "ui.autocomplete", {
.bind( "keydown.autocomplete", function( event ) {
if ( self.options.disabled || self.element.attr( "readonly" ) ) {
suppressKeyPress = true;
suppressInput = true;
return;
}

suppressKeyPress = false;
suppressInput = false;
var keyCode = $.ui.keyCode;
switch( event.keyCode ) {
case keyCode.PAGE_UP:
Expand Down Expand Up @@ -110,15 +113,8 @@ $.widget( "ui.autocomplete", {
self.close( event );
break;
default:
// keypress is triggered before the input value is changed
clearTimeout( self.searching );
self.searching = setTimeout(function() {
// only search if the value has changed
if ( self.term != self._value() ) {
self.selectedItem = null;
self.search( null, event );
}
}, self.options.delay );
// search timeout should be triggered before the input value is changed
self._searchTimeout( event );
break;
}
})
Expand Down Expand Up @@ -150,6 +146,14 @@ $.widget( "ui.autocomplete", {
break;
}
})
.bind( "input.autocomplete", function(event) {
if ( suppressInput ) {
suppressInput = false;
event.preventDefault();
return;
}
self._searchTimeout( event );
})
.bind( "focus.autocomplete", function() {
if ( self.options.disabled ) {
return;
Expand Down Expand Up @@ -317,6 +321,17 @@ $.widget( "ui.autocomplete", {
}
},

_searchTimeout: function( event ) {
var self = this;
self.searching = setTimeout(function() {
// only search if the value has changed
if ( self.term != self.element.val() ) {
self.selectedItem = null;
self.search( null, event );
}
}, self.options.delay );
},

search: function( value, event ) {
value = value != null ? value : this._value();

Expand Down

0 comments on commit adb3557

Please sign in to comment.