svn commit: r469644 - in /incubator/wicket/branches/wicket-1.x/wicket-extensions/src/main/java/wicket/extensions/ajax/markup/html/autocomplete: AbstractAutoCompleteBehavior.java wicket-autocomplete.js

[knopp]

Author: knopp
Date: Tue Oct 31 12:38:41 2006
New Revision: 469644

URL: http://svn.apache.org/viewvc?view=rev&rev=469644
Log:
Fixed autocomplete header contribution. 

Modified:
    
incubator/wicket/branches/wicket-1.x/wicket-extensions/src/main/java/wicket/extensions/ajax/markup/html/autocomplete/AbstractAutoCompleteBehavior.java
    
incubator/wicket/branches/wicket-1.x/wicket-extensions/src/main/java/wicket/extensions/ajax/markup/html/autocomplete/wicket-autocomplete.js

Modified: 
incubator/wicket/branches/wicket-1.x/wicket-extensions/src/main/java/wicket/extensions/ajax/markup/html/autocomplete/AbstractAutoCompleteBehavior.java
URL: 
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket-extensions/src/main/java/wicket/extensions/ajax/markup/html/autocomplete/AbstractAutoCompleteBehavior.java?view=diff&rev=469644&r1=469643&r2=469644
==============================================================================
--- 
incubator/wicket/branches/wicket-1.x/wicket-extensions/src/main/java/wicket/extensions/ajax/markup/html/autocomplete/AbstractAutoCompleteBehavior.java
 (original)
+++ 
incubator/wicket/branches/wicket-1.x/wicket-extensions/src/main/java/wicket/extensions/ajax/markup/html/autocomplete/AbstractAutoCompleteBehavior.java
 Tue Oct 31 12:38:41 2006
@@ -40,6 +40,23 @@
        private static final long serialVersionUID = 1L;
 
        protected void onRenderHeadContribution(Response response)
+       {       
+       }
+       
+       protected void onBind()
+       {
+               // add empty AbstractDefaultAjaxBehavior to the component, to 
force 
+               // rendering wicket-ajax.js reference if no other ajax behavior 
is on page
+               getComponent().add(new AbstractDefaultAjaxBehavior() {
+                       private static final long serialVersionUID = 1L;
+
+                       protected void respond(AjaxRequestTarget target)
+                       {                               
+                       }                                               
+               });
+       }
+       
+       protected void onRenderHeadInitContribution(Response response)
        {
                writeJsReference(response, AUTOCOMPLETE_JS);
        }
@@ -49,16 +66,21 @@
                Response response = getComponent().getResponse();
                final String id = getComponent().getMarkupId();
                response.write(JavascriptUtils.SCRIPT_OPEN_TAG);
-               response.write("new Wicket.Ajax.AutoComplete('" + id + "','" + 
getCallbackUrl() + "');");
+               response.write("new Wicket.AutoComplete('" + id + "','" + 
getCallbackUrl() + "');");
                response.write(JavascriptUtils.SCRIPT_CLOSE_TAG);
        }
 
+       protected String getImplementationId()
+       {               
+               return "wicket-autocomplete";
+       }
+       
        protected void respond(AjaxRequestTarget target)
        {
                final RequestCycle requestCycle = RequestCycle.get();
                final String val = requestCycle.getRequest().getParameter("q");
                onRequest(val, requestCycle);
-       }
+       }               
 
        /**
         * Callback for the ajax event generated by the javascript. This is 
where we

Modified: 
incubator/wicket/branches/wicket-1.x/wicket-extensions/src/main/java/wicket/extensions/ajax/markup/html/autocomplete/wicket-autocomplete.js
URL: 
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket-extensions/src/main/java/wicket/extensions/ajax/markup/html/autocomplete/wicket-autocomplete.js?view=diff&rev=469644&r1=469643&r2=469644
==============================================================================
--- 
incubator/wicket/branches/wicket-1.x/wicket-extensions/src/main/java/wicket/extensions/ajax/markup/html/autocomplete/wicket-autocomplete.js
 (original)
+++ 
incubator/wicket/branches/wicket-1.x/wicket-extensions/src/main/java/wicket/extensions/ajax/markup/html/autocomplete/wicket-autocomplete.js
 Tue Oct 31 12:38:41 2006
@@ -3,8 +3,11 @@
  * Licensed under the Apache License, Version 2.0
  * @author Janne Hietamäki
  */
-  
-Wicket.Ajax.AutoComplete=function(elementId,callbackUrl){
+
+if (typeof(Wicket) == "undefined")
+       Wicket = { };
+         
+Wicket.AutoComplete=function(elementId,callbackUrl){
     var KEY_BACKSPACE=8;
     var KEY_TAB=9;
     var KEY_ENTER=13;