Author: kostat
Date: 2006-01-18 03:46:06 -0500 (Wed, 18 Jan 2006)
New Revision: 55709
Modified:
trunk/mcs/class/System.Web/System.Web.UI.WebControls/Button.cs
trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
Log:
preserve user logic when adding client validation
Modified: trunk/mcs/class/System.Web/System.Web.UI.WebControls/Button.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.WebControls/Button.cs
2006-01-18 08:38:04 UTC (rev 55708)
+++ trunk/mcs/class/System.Web/System.Web.UI.WebControls/Button.cs
2006-01-18 08:46:06 UTC (rev 55709)
@@ -189,8 +189,11 @@
writer.AddAttribute (HtmlTextWriterAttribute.Value,
Text);
if (CausesValidation && Page != null &&
Page.AreValidatorsUplevel ()) {
+ string onclick = Attributes["onclick"];
+ if (onclick != null)
+ Attributes.Remove("onclick");
ClientScriptManager csm = new
ClientScriptManager (Page);
- writer.AddAttribute
(HtmlTextWriterAttribute.Onclick, csm.GetClientValidationEvent ());
+ writer.AddAttribute
(HtmlTextWriterAttribute.Onclick, onclick + csm.GetClientValidationEvent ());
writer.AddAttribute ("language", "javascript");
}
Modified: trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
2006-01-18 08:38:04 UTC (rev 55708)
+++ trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
2006-01-18 08:46:06 UTC (rev 55709)
@@ -1,5 +1,9 @@
2006-01-15 Konstantin Triger <[EMAIL PROTECTED]>
+ * Button.cs: preserve user logic when adding client validation.
+
+2006-01-15 Konstantin Triger <[EMAIL PROTECTED]>
+
* BaseValidator.cs: fixing visibility bahavior
2006-01-13 Gonzalo Paniagua Javier <[EMAIL PROTECTED]>
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
