Repository: wicket
Updated Branches:
  refs/heads/master 90b7ca90d -> 8ee88f13c


WICKET-5657 wicket-autocomplete may fail after preceeding Ajax request

Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/8ee88f13
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/8ee88f13
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/8ee88f13

Branch: refs/heads/master
Commit: 8ee88f13ceff97dfc0a4818f4c368525d1f799eb
Parents: 90b7ca9
Author: svenmeier <[email protected]>
Authored: Wed Jul 30 19:26:52 2014 +0200
Committer: svenmeier <[email protected]>
Committed: Wed Jul 30 19:26:52 2014 +0200

----------------------------------------------------------------------
 .../ajax/markup/html/autocomplete/wicket-autocomplete.js  | 10 ++++++++++
 1 file changed, 10 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/8ee88f13/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/wicket-autocomplete.js
----------------------------------------------------------------------
diff --git 
a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/wicket-autocomplete.js
 
b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/wicket-autocomplete.js
index cd4ca31..7d6366a 100644
--- 
a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/wicket-autocomplete.js
+++ 
b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/wicket-autocomplete.js
@@ -339,6 +339,11 @@
                        var attrs = {
                                u: callbackUrl,
                                pre: [ function (attributes) {
+                                       // since attrs.c is not set, we have to 
check existence by ourself
+                                       if (!Wicket.$$(elementId)) {
+                                               return false;
+                                       }
+                                       
                                        var activeIsInitial = 
(document.activeElement === initialElement);
                                        var elementVal =  
Wicket.$(elementId).value;
                                        var hasMinimumLength = 
elementVal.length >= minInputLength;
@@ -365,6 +370,11 @@
                        var attrs = {
                                u: callbackUrl,
                                pre: [ function (attributes) {
+                                       // since attrs.c is not set, we have to 
check existence by ourself
+                                       if (!Wicket.$$(elementId)) {
+                                               return false;
+                                       }
+
                                        var activeIsInitial = 
(document.activeElement === initialElement);
                                        var elementVal =  
Wicket.$(elementId).value;
                                        var hasMinimumLength = 
elementVal.length >= minInputLength;

Reply via email to