Autocomplete: Added response event. Fixes #6777 - Autocomplete callback when search...

diff --git a/tests/unit/autocomplete/autocomplete_events.js b/tests/unit/autocomplete/autocomplete_events.js
index aa0a17730cad58a4e367a38e5d71c41d2bd3b860..35103d89b1d6fa76707dfcb709c1cde8fc78e560 100644 (file)
--- a/tests/unit/autocomplete/autocomplete_events.js
+++ b/tests/unit/autocomplete/autocomplete_events.js
@@ -9,10 +9,10 @@ module("autocomplete: events", {
        }
 });
 
-var data = ["c++", "java", "php", "coldfusion", "javascript", "asp", "ruby", "python", "c", "scala", "groovy", "haskell", "perl"];
+var data = [ "Clojure", "COBOL", "ColdFusion", "Java", "JavaScript", "Scala", "Scheme" ];
 
 test("all events", function() {
-       expect(12);
+       expect(14);
        var ac = $("#autocomplete").autocomplete({
                autoFocus: false,
                delay: 0,
@@ -20,12 +20,21 @@ test("all events", function() {
                search: function(event) {
                        same(event.type, "autocompletesearch");
                },
+               response: function(event, ui) {
+                       same(event.type, "autocompleteresponse");
+                       same(ui.content, [
+                               { label: "Clojure", value: "Clojure" },
+                               { label: "Java", value: "Java" },
+                               { label: "JavaScript", value: "JavaScript" }
+                       ]);
+                       ui.content.splice( 0, 1 );
+               },
                open: function(event) {
                        same(event.type, "autocompleteopen");
                },
                focus: function(event, ui) {
                        same(event.type, "autocompletefocus");
-                       same(ui.item, {label:"java", value:"java"});
+                       same(ui.item, {label:"Java", value:"Java"});
                },
                close: function(event) {
                        same(event.type, "autocompleteclose");
@@ -33,17 +42,17 @@ test("all events", function() {
                },
                select: function(event, ui) {
                        same(event.type, "autocompleteselect");
-                       same(ui.item, {label:"java", value:"java"});
+                       same(ui.item, {label:"Java", value:"Java"});
                },
                change: function(event, ui) {
                        same(event.type, "autocompletechange");
-                       same(ui.item, {label:"java", value:"java"});
+                       same(ui.item, {label:"Java", value:"Java"});
                        same( $(".ui-menu:visible").length, 0 );
                        start();
                }
        });
        stop();
-       ac.focus().val("ja").keydown();
+       ac.focus().val("j").keydown();
        setTimeout(function() {
                same( $(".ui-menu:visible").length, 1 );
                ac.simulate("keydown", { keyCode: $.ui.keyCode.DOWN });
@@ -55,7 +64,7 @@ test("all events", function() {
 });
 
 test("all events - contenteditable", function() {
-       expect(12);
+       expect(14);
        var ac = $("#autocomplete-contenteditable").autocomplete({
                autoFocus: false,
                delay: 0,
@@ -63,12 +72,21 @@ test("all events - contenteditable", function() {
                search: function(event) {
                        same(event.type, "autocompletesearch");
                },
+               response: function(event, ui) {
+                       same(event.type, "autocompleteresponse");
+                       same(ui.content, [
+                               { label: "Clojure", value: "Clojure" },
+                               { label: "Java", value: "Java" },
+                               { label: "JavaScript", value: "JavaScript" }
+                       ]);
+                       ui.content.splice( 0, 1 );
+               },
                open: function(event) {
                        same(event.type, "autocompleteopen");
                },
                focus: function(event, ui) {
                        same(event.type, "autocompletefocus");
-                       same(ui.item, {label:"java", value:"java"});
+                       same(ui.item, {label:"Java", value:"Java"});
                },
                close: function(event) {
                        same(event.type, "autocompleteclose");
@@ -76,17 +94,17 @@ test("all events - contenteditable", function() {
                },
                select: function(event, ui) {
                        same(event.type, "autocompleteselect");
-                       same(ui.item, {label:"java", value:"java"});
+                       same(ui.item, {label:"Java", value:"Java"});
                },
                change: function(event, ui) {
                        same(event.type, "autocompletechange");
-                       same(ui.item, {label:"java", value:"java"});
+                       same(ui.item, {label:"Java", value:"Java"});
                        same( $(".ui-menu:visible").length, 0 );
                        start();
                }
        });
        stop();
-       ac.focus().text("ja").keydown();
+       ac.focus().text("j").keydown();
        setTimeout(function() {
                same( $(".ui-menu:visible").length, 1 );
                ac.simulate("keydown", { keyCode: $.ui.keyCode.DOWN });

diff --git a/ui/jquery.ui.autocomplete.js b/ui/jquery.ui.autocomplete.js
index ee6eb659f4b709c0bd60f8d54f98f4dbf3de02c9..ca06fff65846d7368a51b846b8f78af1092430da 100644 (file)
--- a/ui/jquery.ui.autocomplete.js
+++ b/ui/jquery.ui.autocomplete.js
@@ -307,8 +307,11 @@ $.widget( "ui.autocomplete", {
        },
 
        _response: function( content ) {
-               if ( !this.options.disabled && content && content.length ) {
+               if ( content ) {
                        content = this._normalize( content );
+               }
+               this._trigger( "response", null, { content: content } );
+               if ( !this.options.disabled && content && content.length ) {
                        this._suggest( content );
                        this._trigger( "open" );
                } else {