Repository: wicket Updated Branches: refs/heads/wicket-6.x 44b9f1afd -> fd2dcbe51
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/fd2dcbe5 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/fd2dcbe5 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/fd2dcbe5 Branch: refs/heads/wicket-6.x Commit: fd2dcbe5185cef2c5ed58e0a2446ecfe37ba8fb1 Parents: 44b9f1a Author: svenmeier <[email protected]> Authored: Wed Jul 30 19:27:08 2014 +0200 Committer: svenmeier <[email protected]> Committed: Wed Jul 30 19:27:08 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/fd2dcbe5/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 df5b5d1..f2c4062 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 @@ -337,6 +337,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; @@ -363,6 +368,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;
