svn commit: r985318 - /wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/wicket-autocomplete.js

[mgrigorov]

Author: mgrigorov
Date: Fri Aug 13 18:44:51 2010
New Revision: 985318

URL: http://svn.apache.org/viewvc?rev=985318&view=rev
Log:
merge-from-1.4.x:

Author: jcompagner
Date: Thu Aug 12 14:23:34 2010
New Revision: 984800

URL: http://svn.apache.org/viewvc?rev=984800&view=rev
Log:
fix for double characters autocomplete and Upper Case


Modified:
    
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/wicket-autocomplete.js

Modified: 
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/wicket-autocomplete.js
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/wicket-autocomplete.js?rev=985318&r1=985317&r2=985318&view=diff
==============================================================================
--- 
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/wicket-autocomplete.js
 (original)
+++ 
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/wicket-autocomplete.js
 Fri Aug 13 18:44:51 2010
@@ -97,7 +97,7 @@ Wicket.AutoComplete=function(elementId, 
         objonchangeoriginal=obj.onchange; 
         obj.onchange=function(event){
                if(mouseactive==1)return false;
-               if(typeof 
objonchangeoriginal=="function")objonchangeoriginal.apply(this,[event]);
+               if(typeof objonchangeoriginal=="function") return 
objonchangeoriginal.apply(this,[event]);
        }
         objonchange=obj.onchange;
                 
@@ -108,7 +108,7 @@ Wicket.AutoComplete=function(elementId, 
                        return killEvent(event);
                }
                hideAutoComplete();
-               if(typeof objonblur=="function")objonblur.apply(this,[event]);
+               if(typeof objonblur=="function") return 
objonblur.apply(this,[event]);
         }
        
        obj.onfocus=function(event){
@@ -124,7 +124,7 @@ Wicket.AutoComplete=function(elementId, 
                 }
             }
             ignoreOneFocusGain = false;
-               if(typeof objonfocus=="function")objonfocus.apply(this,[event]);
+               if(typeof objonfocus=="function") return 
objonfocus.apply(this,[event]);
         }
 
         obj.onkeydown=function(event){
@@ -170,7 +170,7 @@ Wicket.AutoComplete=function(elementId, 
                         hidingAutocomplete = 1;
                     }
                     mouseactive = 0;
-                    if (typeof objonkeydown=="function") 
objonkeydown.apply(this,[event]);
+                    if (typeof objonkeydown=="function") return 
objonkeydown.apply(this,[event]);
                     return true;
                 break;
                 default:
@@ -194,7 +194,7 @@ Wicket.AutoComplete=function(elementId, 
                 default:
                    updateChoices();
             }
-                       if(typeof 
objonkeyup=="function")objonkeyup.apply(this,[event]);
+                       if(typeof objonkeyup=="function") return 
objonkeyup.apply(this,[event]);
         }
 
         obj.onkeypress=function(event){
@@ -204,7 +204,7 @@ Wicket.AutoComplete=function(elementId, 
                                return killEvent(event);
                 }
             }
-                       if(typeof 
objonkeypress=="function")objonkeypress.apply(this,[event]);
+                       if(typeof objonkeypress=="function") return 
objonkeypress.apply(this,[event]);
         }
     }