Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Autocomplete: Track input changes and fire change-event on blur, alon…
…g with selected item, if available. Fix for #5490
  • Loading branch information
jzaefferer committed Apr 8, 2010
1 parent 10ea61b commit c01b3ba
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 6 deletions.
25 changes: 21 additions & 4 deletions tests/unit/autocomplete/autocomplete_events.js
Expand Up @@ -12,7 +12,7 @@ module("autocomplete: events", {
var data = ["c++", "java", "php", "coldfusion", "javascript", "asp", "ruby", "python", "c", "scala", "groovy", "haskell", "perl"];

test("all events", function() {
expect(11);
expect(12);
var ac = $("#autocomplete").autocomplete({
delay: 0,
source: data,
Expand All @@ -34,21 +34,38 @@ test("all events", function() {
same(event.type, "autocompleteselect");
same(ui.item, {label:"java", value:"java"});
},
change: function(event) {
change: function(event, ui) {
same(event.type, "autocompletechange");
same(ui.item, {label:"java", value:"java"});
same( $(".ui-menu:visible").length, 0 );
start();
}
});
stop();
ac.val("ja").keydown();
ac.focus().val("ja").keydown();
setTimeout(function() {
same( $(".ui-menu:visible").length, 1 );
ac.simulate("keydown", { keyCode: $.ui.keyCode.DOWN });
ac.simulate("keydown", { keyCode: $.ui.keyCode.ENTER });
start();
ac.blur();
}, 50);
});

test("change without selection", function() {
expect(2);
stop();
var ac = $("#autocomplete").autocomplete({
delay: 0,
source: data,
change: function(event, ui) {
same(event.type, "autocompletechange");
same(ui.item, null);
start();
}
});
ac.focus().val("ja").blur();
});

test("cancel search", function() {
expect(6);
var first = true;
Expand Down
11 changes: 9 additions & 2 deletions ui/jquery.ui.autocomplete.js
Expand Up @@ -83,6 +83,7 @@ $.widget( "ui.autocomplete", {
}
})
.bind( "focus.autocomplete", function() {
self.selectedItem = null;
self.previous = self.element.val();
})
.bind( "blur.autocomplete", function( event ) {
Expand All @@ -91,6 +92,7 @@ $.widget( "ui.autocomplete", {
// TODO try to implement this without a timeout, see clearTimeout in search()
self.closing = setTimeout(function() {
self.close( event );
self._change( event );
}, 150 );
});
this._initSource();
Expand All @@ -116,11 +118,13 @@ $.widget( "ui.autocomplete", {
self.element.val( item.value );
}
self.close( event );
self.previous = self.element.val();
// only trigger when focus was lost (click on menu)
var previous = self.previous;
if ( self.element[0] !== doc.activeElement ) {
self.element.focus();
self.previous = previous;
}
self.selectedItem = item;
},
blur: function( event, ui ) {
if ( self.menu.element.is(":visible") ) {
Expand Down Expand Up @@ -219,8 +223,11 @@ $.widget( "ui.autocomplete", {
this.menu.element.hide();
this.menu.deactivate();
}
},

_change: function( event ) {
if ( this.previous !== this.element.val() ) {
this._trigger( "change", event );
this._trigger( "change", event, { item: this.selectedItem } );
}
},

Expand Down

0 comments on commit c01b3ba

Please sign in to comment.