aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott González <scott.gonzalez@gmail.com>2010-10-26 09:05:38 -0400
committerScott González <scott.gonzalez@gmail.com>2010-10-26 09:05:38 -0400
commitf4d8ec9159b84718051b257715b97d22fba936e7 (patch)
treed146308a0ac4408f3e9fc05d0f125d92af228d4c
parent9ead629c2cdd2689028f3a7ebb258aa41ab47afb (diff)
downloadjquery-ui-f4d8ec9159b84718051b257715b97d22fba936e7.tar.gz
jquery-ui-f4d8ec9159b84718051b257715b97d22fba936e7.zip
Autocomplete: Trigger close after hiding the menu. Fixes #6227 - Autocomplete: Don't trigger close event until after the menu is hidden.
-rw-r--r--tests/unit/autocomplete/autocomplete_events.js2
-rw-r--r--ui/jquery.ui.autocomplete.js2
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/unit/autocomplete/autocomplete_events.js b/tests/unit/autocomplete/autocomplete_events.js
index a8924e192..95a86425c 100644
--- a/tests/unit/autocomplete/autocomplete_events.js
+++ b/tests/unit/autocomplete/autocomplete_events.js
@@ -28,7 +28,7 @@ test("all events", function() {
},
close: function(event) {
same(event.type, "autocompleteclose");
- same( $(".ui-menu:visible").length, 1 );
+ same( $(".ui-menu:visible").length, 0 );
},
select: function(event, ui) {
same(event.type, "autocompleteselect");
diff --git a/ui/jquery.ui.autocomplete.js b/ui/jquery.ui.autocomplete.js
index 0ada32f02..1e07b3c16 100644
--- a/ui/jquery.ui.autocomplete.js
+++ b/ui/jquery.ui.autocomplete.js
@@ -295,9 +295,9 @@ $.widget( "ui.autocomplete", {
close: function( event ) {
clearTimeout( this.closing );
if ( this.menu.element.is(":visible") ) {
- this._trigger( "close", event );
this.menu.element.hide();
this.menu.deactivate();
+ this._trigger( "close", event );
}
},