2005-01-31 Zoltan Varga <vargaz@freemail.hu>

[mono.git] / mcs / class / System.Web / System.Web.UI.WebControls / BaseValidator.cs

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/BaseValidator.cs b/mcs/class/System.Web/System.Web.UI.WebControls/BaseValidator.cs
index 82962239aeb873b775f044c8495f31d868f303d0..d8f3da1309737ebdf4cad33fa355c11f0b735a13 100755 (executable)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/BaseValidator.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/BaseValidator.cs
@@ -11,6 +11,27 @@
 // (C) 2003 Andreas Nahr
 //
 
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
 using System;
 using System.ComponentModel;
 using System.ComponentModel.Design;
@@ -171,7 +192,9 @@ namespace System.Web.UI.WebControls
                        if(!Visible || (Visible && !Enabled))
                        {
                                IsValid = true;
+                               return;
                        }
+
                        Control ctrl = Parent;
                        while(ctrl != null)
                        {
@@ -362,11 +385,12 @@ namespace System.Web.UI.WebControls
                [MonoTODO("Damn_This_Is_Really_Frustrating___by_Gaurav")]
                protected void RegisterValidatorCommonScript()
                {
-                       if(Page.IsClientScriptBlockRegistered("ValidatorIncludeScript"))
+                       if(Page.ClientScript.IsClientScriptBlockRegistered("ValidatorIncludeScript"))
                                return;
                        
-                       string jsDirectory = System.Web.UI.Utils.GetScriptLocation(Context);
-                       string jsFile = jsDirectory + "/WebUIValidation.js";
+                       //string jsDirectory = System.Web.UI.Utils.GetScriptLocation(Context);
+                       //string jsFile = jsDirectory + "/WebUIValidation.js";\r
+                        
                        //TODO: Ok, now add the <script language="javascript"> etc
                        //FIXME: Should I check for 'Explorer'? MS-Net seems to do it!
                        throw new NotImplementedException();
@@ -380,7 +404,7 @@ namespace System.Web.UI.WebControls
                        //I'm confused! This will make it work, at least on IE
                        string val = "document.all[\"" + ClientID;
                        val += "\"]";
-                       Page.RegisterArrayDeclaration("Page_Validators", val);
+                       Page.ClientScript.RegisterArrayDeclaration("Page_Validators", val);
                }
 
                [MonoTODO("Render_ing_always_left")]