2005-11-21 Gonzalo Paniagua Javier <gonzalo@ximian.com>

	* HtmlInputButton.cs: render the onclick attribute only when the
	button is a 'submit' and no validators or when the button is a
	'button' and there's a registered ServerClick event. Fixes bug #76781.


svn path=/trunk/mcs/; revision=53316

1 files changed, 20 insertions, 1 deletions

diff --git a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputButton.cs b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputButton.cs
index dd4a7bab981..d31ca9a5e6a 100644
--- a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputButton.cs
+++ b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputButton.cs
@@ -27,6 +27,7 @@
 //
 
 using System.ComponentModel;
+using System.Globalization;
 using System.Security.Permissions;
 
 namespace System.Web.UI.HtmlControls {
@@ -140,9 +141,27 @@ namespace System.Web.UI.HtmlControls {
 				server_click (this, e);
 		}
 
+		bool RenderOnClick ()
+		{
+			if (Page == null || !CausesValidation)
+				return false;
+
+			CultureInfo inv = CultureInfo.InvariantCulture;
+			string input_type = Type;
+			if (0 == String.Compare (input_type, "submit", true, inv) &&
+				Page.Validators.Count > 0)
+				return true;
+
+			if (0 == String.Compare (input_type, "button", true, inv) &&
+				Events [ServerClickEvent] != null)
+				return true;
+
+			return false;
+		}
+
 		protected override void RenderAttributes (HtmlTextWriter writer)
 		{
-			if (CausesValidation && Page != null) {
+			if (RenderOnClick ()) {
 				string oc = null;
 				ClientScriptManager csm = new ClientScriptManager (Page);
 				if (Page.AreValidatorsUplevel ()) {