mirror of
https://github.com/jquery/jquery-ui.git
synced 2024-11-21 11:04:24 +00:00
Merge remote branch 'treyhunner/topic/autocomplete-pasting'
This commit is contained in:
commit
4f0f407df3
35
ui/jquery.ui.autocomplete.js
vendored
35
ui/jquery.ui.autocomplete.js
vendored
@ -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" ];
|
||||
|
||||
@ -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:
|
||||
@ -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;
|
||||
}
|
||||
})
|
||||
@ -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;
|
||||
@ -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();
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user