svn commit: r662959 - /wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxButton.java

[ivaynberg]

Author: ivaynberg
Date: Tue Jun  3 20:14:31 2008
New Revision: 662959

URL: http://svn.apache.org/viewvc?rev=662959&view=rev
Log:
utilize getonclickjavascript from button

Modified:
    
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxButton.java

Modified: 
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxButton.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxButton.java?rev=662959&r1=662958&r2=662959&view=diff
==============================================================================
--- 
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxButton.java
 (original)
+++ 
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxButton.java
 Tue Jun  3 20:14:31 2008
@@ -38,7 +38,7 @@
 {
        private static final long serialVersionUID = 1L;
 
-       private final Form< ? > form;
+       private final Form<?> form;
 
        /**
         * Construct.
@@ -57,7 +57,7 @@
         * @see org.apache.wicket.markup.html.form.FormComponent#getForm()
         */
        @Override
-       public Form< ? > getForm()
+       public Form<?> getForm()
        {
                if (form != null)
                {
@@ -75,7 +75,7 @@
         * @param id
         * @param form
         */
-       public AjaxButton(String id, final Form< ? > form)
+       public AjaxButton(String id, final Form<?> form)
        {
                super(id);
                this.form = form;
@@ -111,7 +111,11 @@
                        @Override
                        protected CharSequence getEventHandler()
                        {
-                               return new 
AppendingStringBuffer(super.getEventHandler()).append("; return false;");
+                               AppendingStringBuffer handler = new 
AppendingStringBuffer();
+                               
handler.append(AjaxButton.this.getOnClickScript());
+                               
handler.append(";").append(super.getEventHandler());
+                               handler.append("; return false;");
+                               return handler;
                        }
 
                        /**
@@ -143,7 +147,7 @@
         * @param target
         * @param form
         */
-       protected abstract void onSubmit(AjaxRequestTarget target, Form< ? > 
form);
+       protected abstract void onSubmit(AjaxRequestTarget target, Form<?> 
form);
 
        /**
         * Listener method invoked on form submit with errors
@@ -153,7 +157,7 @@
         * 
         * TODO 1.3: Make abstract to be consistent with onSubmit()
         */
-       protected void onError(AjaxRequestTarget target, Form< ? > form)
+       protected void onError(AjaxRequestTarget target, Form<?> form)
        {
        }
 }