[Magicajax-cvs] magicajax/Core AjaxCallHelper.cs,1.26,1.27

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

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

Modified Files:
	AjaxCallHelper.cs 
Log Message:
Fix for reflecting validator array declaration only once.

Index: AjaxCallHelper.cs
===================================================================
RCS file: /cvsroot/magicajax/magicajax/Core/AjaxCallHelper.cs,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** AjaxCallHelper.cs	29 Jan 2006 23:36:58 -0000	1.26
--- AjaxCallHelper.cs	6 Feb 2006 13:20:47 -0000	1.27
***************
*** 510,530 ****
  		}
  		
- 		public static void Page_Unload(object sender, EventArgs e)
- 		{
- 			// Reflect added startup-scripts and arrays AFTER reflecting the controls HTML
- 			if (MagicAjaxContext.Current.IsAjaxCall)
- 			{
- 				Page page = (Page)sender;
- 				
- 				HandleArrayDeclares(page, true);
- 				HandleClientStartupScripts(page, true);
- 
- 				// Store scriptblock fingerprints in hidden field
- 				string allScriptFPs = string.Join(";", (string[])_currentScriptFPs.ToArray(typeof(string)));
- 				if (HttpContext.Current.Request.Form["__MAGICAJAX_SCRIPT_FINGERPRINTS"] != allScriptFPs)
- 					AjaxCallHelper.WriteSetFieldScript("__MAGICAJAX_SCRIPT_FINGERPRINTS", allScriptFPs);
- 			}
- 		}
- 		
  		/// <summary>
  		/// Reflects registered Hidden fields if added/changed on callback
--- 510,513 ----
***************
*** 556,566 ****
  				// Not in Ajax call, so create fingerprints of all script blocks
  				HandleClientScriptBlocks(page, false);
- 				HandleArrayDeclares(page, false);
- 				HandleClientStartupScripts(page, false);
  				HandleOnSubmitStatements(page, false);
  
! 				// Store scriptblock fingerprints in hidden field
! 				page.RegisterHiddenField("__MAGICAJAX_SCRIPT_FINGERPRINTS", 
! 					string.Join(";", (string[])_currentScriptFPs.ToArray(typeof(string))));
  			}
  		}
--- 539,546 ----
  				// Not in Ajax call, so create fingerprints of all script blocks
  				HandleClientScriptBlocks(page, false);
  				HandleOnSubmitStatements(page, false);
  
! 				// Create hidden field to store scriptblock fingerprints later on (see Render method of RenderedByScriptControl.cs)
! 				page.RegisterHiddenField("__MAGICAJAX_SCRIPT_FINGERPRINTS", String.Empty);
  			}
  		}
***************
*** 573,577 ****
  		/// When reflectToClient is true, also reflects the changed tags inside head.
  		///</summary>
! 		protected static void RenderHead(HtmlTextWriter writer, Control ctl)
  		{
  			if (ctl != null)
--- 553,557 ----
  		/// When reflectToClient is true, also reflects the changed tags inside head.
  		///</summary>
! 		public static void RenderHead(HtmlTextWriter writer, Control ctl)
  		{
  			if (ctl != null)
***************
*** 660,664 ****
  		/// <param name="page"></param>
  		/// <param name="reflectToClient"></param>
! 		private static void HandleHiddenFields(Page page)
  		{
  			IDictionary regFields = GetPageHiddenDictionary(page, "_registeredHiddenFields");
--- 640,644 ----
  		/// <param name="page"></param>
  		/// <param name="reflectToClient"></param>
! 		public static void HandleHiddenFields(Page page)
  		{
  			IDictionary regFields = GetPageHiddenDictionary(page, "_registeredHiddenFields");
***************
*** 684,688 ****
  		/// Handle registered ClientScriptBlocks to see if some where added/changed on callback/postback
  		/// </summary>
! 		private static void HandleClientScriptBlocks(Page page, bool reflectToClient)
  		{
  			IDictionary regScripts = GetPageHiddenDictionary(page, "_registeredClientScriptBlocks");
--- 664,668 ----
  		/// Handle registered ClientScriptBlocks to see if some where added/changed on callback/postback
  		/// </summary>
! 		public static void HandleClientScriptBlocks(Page page, bool reflectToClient)
  		{
  			IDictionary regScripts = GetPageHiddenDictionary(page, "_registeredClientScriptBlocks");
***************
*** 694,698 ****
  		/// </summary>
  		/// <param name="reflectToClient"></param>
! 		private static void HandleOnSubmitStatements(Page page, bool reflectToClient)
  		{
  			IDictionary regScripts = GetPageHiddenDictionary(page, "_registeredOnSubmitStatements");
--- 674,678 ----
  		/// </summary>
  		/// <param name="reflectToClient"></param>
! 		public static void HandleOnSubmitStatements(Page page, bool reflectToClient)
  		{
  			IDictionary regScripts = GetPageHiddenDictionary(page, "_registeredOnSubmitStatements");
***************
*** 720,724 ****
  		/// </summary>
  		/// <param name="reflectToClient"></param>
! 		private static void HandleClientStartupScripts(Page page, bool reflectToClient)
  		{
  			IDictionary regScripts = GetPageHiddenDictionary(page, "_registeredClientStartupScripts");
--- 700,704 ----
  		/// </summary>
  		/// <param name="reflectToClient"></param>
! 		public static void HandleClientStartupScripts(Page page, bool reflectToClient)
  		{
  			IDictionary regScripts = GetPageHiddenDictionary(page, "_registeredClientStartupScripts");
***************
*** 730,734 ****
  		/// </summary>
  		/// <param name="reflectToClient"></param>
! 		private static void HandleArrayDeclares(Page page, bool reflectToClient)
  		{
  			IDictionary regArrays = GetPageHiddenDictionary(page, "_registeredArrayDeclares");
--- 710,714 ----
  		/// </summary>
  		/// <param name="reflectToClient"></param>
! 		public static void HandleArrayDeclares(Page page, bool reflectToClient)
  		{
  			IDictionary regArrays = GetPageHiddenDictionary(page, "_registeredArrayDeclares");