aboutsummaryrefslogtreecommitdiffstats
path: root/ui/jquery.ui.autocomplete.js
diff options
context:
space:
mode:
authorScott González <scott.gonzalez@gmail.com>2010-12-17 10:48:17 -0500
committerScott González <scott.gonzalez@gmail.com>2010-12-17 10:48:17 -0500
commit0d0c86210c4a6473888089ddcea918df8c156022 (patch)
treeaa28f7e0d73af431e2808dcdff251f74f3187db5 /ui/jquery.ui.autocomplete.js
parentcf48a3c5c8da7bc90a9424e333d53d0e178e7885 (diff)
downloadjquery-ui-0d0c86210c4a6473888089ddcea918df8c156022.tar.gz
jquery-ui-0d0c86210c4a6473888089ddcea918df8c156022.zip
Autocomplete: Abort pending ajax requests when disabled and prevent handling results when disabled. Fixes #6752 - Menu may still render when autocomplete is disabled.
Diffstat (limited to 'ui/jquery.ui.autocomplete.js')
-rw-r--r--ui/jquery.ui.autocomplete.js7
1 files changed, 5 insertions, 2 deletions
diff --git a/ui/jquery.ui.autocomplete.js b/ui/jquery.ui.autocomplete.js
index 9b1b3f2c9..090dd7355 100644
--- a/ui/jquery.ui.autocomplete.js
+++ b/ui/jquery.ui.autocomplete.js
@@ -227,6 +227,9 @@ $.widget( "ui.autocomplete", {
if ( key === "appendTo" ) {
this.menu.element.appendTo( $( value || "body", this.element[0].ownerDocument )[0] )
}
+ if ( key === "disabled" && value && this.xhr ) {
+ this.xhr.abort();
+ }
},
_initSource: function() {
@@ -241,7 +244,7 @@ $.widget( "ui.autocomplete", {
} else if ( typeof this.options.source === "string" ) {
url = this.options.source;
this.source = function( request, response ) {
- if (self.xhr) {
+ if ( self.xhr ) {
self.xhr.abort();
}
self.xhr = $.ajax({
@@ -292,7 +295,7 @@ $.widget( "ui.autocomplete", {
},
_response: function( content ) {
- if ( content && content.length ) {
+ if ( !this.options.disabled && content && content.length ) {
content = this._normalize( content );
this._suggest( content );
this._trigger( "open" );