You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by jc...@apache.org on 2011/11/25 14:30:37 UTC
svn commit: r1206158 - in /wicket/branches/wicket-1.5.x/wicket-extensions: ./
src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/wicket-autocomplete.js
Author: jcompagner
Date: Fri Nov 25 13:30:36 2011
New Revision: 1206158
URL: http://svn.apache.org/viewvc?rev=1206158&view=rev
Log:
Wicket autocomplete should try to select the real selected value in the list if preselect property is true instead of just always 0
Issue: WICKET-4262
Modified:
wicket/branches/wicket-1.5.x/wicket-extensions/ (props changed)
wicket/branches/wicket-1.5.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/wicket-autocomplete.js
Propchange: wicket/branches/wicket-1.5.x/wicket-extensions/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 25 13:30:36 2011
@@ -1,5 +1,5 @@
/wicket/branches/wicket-1.3.x/jdk-1.4/wicket-extensions:659248,661657,662360,677853,688992,698612,700502,701879,725634,760368,769440,772653,786424,790850
-/wicket/branches/wicket-1.4.x/wicket-extensions:963681
+/wicket/branches/wicket-1.4.x/wicket-extensions:963681,1206142,1206154
/wicket/sandbox/jthomerson/experimental/wicket-devutils/wicket-extensions:760296-760351,760353-760355
/wicket/trunk/wicket-devutils/wicket-extensions:760352
/wicket/trunk/wicket-extensions:1204836,1204865
Modified: wicket/branches/wicket-1.5.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/wicket-autocomplete.js
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.5.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/wicket-autocomplete.js?rev=1206158&r1=1206157&r2=1206158&view=diff
==============================================================================
--- wicket/branches/wicket-1.5.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/wicket-autocomplete.js (original)
+++ wicket/branches/wicket-1.5.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/wicket-autocomplete.js Fri Nov 25 13:30:36 2011
@@ -640,7 +640,23 @@ Wicket.AutoComplete=function(elementId,
if(elementCount>0){
if(cfg.preselect==true){
- setSelected(0);
+ var selectedIndex = 0;
+ for(var i = 0;i < elementCount; i++) {
+ var node = selectableElements[i];
+ var attr= node.attributes['textvalue'];
+ var value;
+ if (attr==undefined) {
+ value=node.innerHTML;
+ } else {
+ value=attr.value;
+ }
+ if (stripHTML(value) == input.value)
+ {
+ selectedIndex = i;
+ break;
+ }
+ }
+ setSelected(selectedIndex);
}
showAutoComplete();
} else {