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

[ivaynberg]

Author: ivaynberg
Date: Tue Jun  3 20:17:11 2008
New Revision: 662962

URL: http://svn.apache.org/viewvc?rev=662962&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=662962&r1=662961&r2=662962&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:17:11 2008
@@ -22,6 +22,7 @@
 import org.apache.wicket.markup.html.form.Button;
 import org.apache.wicket.markup.html.form.Form;
 import org.apache.wicket.util.string.AppendingStringBuffer;
+import org.apache.wicket.util.string.Strings;
 
 /**
  * A button that submits the form via ajax. Since this button takes the form 
as a constructor
@@ -111,9 +112,16 @@
                        @Override
                        protected CharSequence getEventHandler()
                        {
+                               final String script = 
AjaxButton.this.getOnClickScript();
+
                                AppendingStringBuffer handler = new 
AppendingStringBuffer();
-                               
handler.append(AjaxButton.this.getOnClickScript());
-                               
handler.append(";").append(super.getEventHandler());
+
+                               if (!Strings.isEmpty(script))
+                               {
+                                       handler.append(script).append(";");
+                               }
+
+                               handler.append(super.getEventHandler());
                                handler.append("; return false;");
                                return handler;
                        }