[Magicajax-cvs] magicajax/Core MagicAjaxModule.cs,1.37,1.38 PageFilter.cs,1.3,1.4 Util.cs,1.11,1.12

[Dion O. <dol...@us...>]

Update of /cvsroot/magicajax/magicajax/Core
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22237/magicajax/Core

Modified Files:
	MagicAjaxModule.cs PageFilter.cs Util.cs 
Log Message:
Fix that sets the 'EnableClientScript' property of all validators inside a AjaxPanel to 'false' for NoStore mode. This solves the clientside validation script errors.

Index: PageFilter.cs
===================================================================
RCS file: /cvsroot/magicajax/magicajax/Core/PageFilter.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PageFilter.cs	2 Dec 2005 00:07:27 -0000	1.3
--- PageFilter.cs	2 Dec 2005 08:25:10 -0000	1.4
***************
*** 41,65 ****
  			return html.Substring(si, ei - si);
  		}
- 		
- 		/// <summary>
- 		/// Returns the javascript declaration of the 'Page_Validators' array in the output Html
- 		/// </summary>
- 		/// <returns></returns>
- 		public string GetPageValidatorsArray()
- 		{
- 			string search = "Page_Validators =  new Array(";
- 			string clearValidatorArray = "Page_Validators = new Array();";
- 			
- 			string html = GetHtmlPage();
- 			int si = html.IndexOf(search);
- 			if (si == -1)
- 				return clearValidatorArray;
- 				
- 			int ei = html.IndexOf(");", si);
- 			if (ei == -1)
- 				return clearValidatorArray;
- 
- 			return html.Substring(si, ei - si + 2);
- 		}
  
  #if NET_2_0
--- 41,44 ----

Index: Util.cs
===================================================================
RCS file: /cvsroot/magicajax/magicajax/Core/Util.cs,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Util.cs	25 Nov 2005 20:45:47 -0000	1.11
--- Util.cs	2 Dec 2005 08:25:10 -0000	1.12
***************
*** 123,131 ****
  			for (int i=0; i < parentControl.Controls.Count; i++)
  			{
!                 Control con = parentControl.Controls[i];
!                 if (onlyVisible && !con.Visible)
  					continue;
  
!                 if ( type.IsInstanceOfType(con) )
  					list.Add (con);
  
--- 123,131 ----
  			for (int i=0; i < parentControl.Controls.Count; i++)
  			{
! 				Control con = parentControl.Controls[i];
! 				if (onlyVisible && !con.Visible)
  					continue;
  
! 				if ( type.IsInstanceOfType(con) )
  					list.Add (con);
  

Index: MagicAjaxModule.cs
===================================================================
RCS file: /cvsroot/magicajax/magicajax/Core/MagicAjaxModule.cs,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** MagicAjaxModule.cs	2 Dec 2005 00:07:27 -0000	1.37
--- MagicAjaxModule.cs	2 Dec 2005 08:25:10 -0000	1.38
***************
*** 509,520 ****
  						AjaxCallHelper.WriteSetFieldScript("__VIEWSTATE", vsValue);
  					}
- 					
- 					// Reset the javascript 'Page_Validators' array on each callback
- 					// Note: this is a temporary solution until we find a better one
- 					string pageValidatorsArray = _filter.GetPageValidatorsArray();
- 					if (pageValidatorsArray != null)
- 					{
- 						AjaxCallHelper.Write(pageValidatorsArray);
- 					}
  
  #if NET_2_0
--- 509,512 ----