Author: kostat
Date: 2007-05-31 10:46:56 -0400 (Thu, 31 May 2007)
New Revision: 78336
Modified:
branches/mainsoft/gh20/mcs/class/System.Web/System.Web.UI.WebControls/BaseValidator.cs
Log:
merge -r 78304:78305
Modified:
branches/mainsoft/gh20/mcs/class/System.Web/System.Web.UI.WebControls/BaseValidator.cs
===================================================================
---
branches/mainsoft/gh20/mcs/class/System.Web/System.Web.UI.WebControls/BaseValidator.cs
2007-05-31 14:40:54 UTC (rev 78335)
+++
branches/mainsoft/gh20/mcs/class/System.Web/System.Web.UI.WebControls/BaseValidator.cs
2007-05-31 14:46:56 UTC (rev 78336)
@@ -429,9 +429,9 @@
protected void RegisterValidatorCommonScript ()
{
- if (!Page.ClientScript.IsClientScriptIncludeRegistered
(GetType (), "Mono-System.Web-ValidationClientScriptBlock"))
- Page.ClientScript.RegisterClientScriptInclude
(GetType (), "Mono-System.Web-ValidationClientScriptBlock",
- Page.ClientScript.GetWebResourceUrl
(GetType (),
+ if (!Page.ClientScript.IsClientScriptIncludeRegistered
(typeof (BaseValidator), "Mono-System.Web-ValidationClientScriptBlock"))
+ Page.ClientScript.RegisterClientScriptInclude
(typeof (BaseValidator), "Mono-System.Web-ValidationClientScriptBlock",
+ Page.ClientScript.GetWebResourceUrl
(typeof (BaseValidator),
#if NET_2_0
"WebUIValidation_2.0.js"));
#else
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
