[Magicajax-cvs] magicajax/Core/UI/Controls AjaxPanel.cs,1.12,1.13

[Argiris K. <be...@us...>]

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

Modified Files:
	AjaxPanel.cs 
Log Message:
Changed 'MagicAjax library' to 'framework' as this is more appropriate.
Fixed a bug of ExtendedRendering for 'NoStore'.

Index: AjaxPanel.cs
===================================================================
RCS file: /cvsroot/magicajax/magicajax/Core/UI/Controls/AjaxPanel.cs,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** AjaxPanel.cs	18 Nov 2005 17:46:17 -0000	1.12
--- AjaxPanel.cs	18 Nov 2005 18:53:07 -0000	1.13
***************
*** 1,5 ****
  #region LGPL License
  /*
! MagicAjax Library
  Copyright (C) 2005  MagicAjax Project Team
  
--- 1,5 ----
  #region LGPL License
  /*
! MagicAjax.NET Framework
  Copyright (C) 2005  MagicAjax Project Team
  
***************
*** 313,322 ****
  			//note:only for NoStore mode
  			_controlState.SetControlIDs(_controlHtmlHashes);  
! 			_controlState.Save (this.UniqueID, this.Page);
  		}
  
  		protected virtual void LoadControlState()
  		{
! 			_controlState = ControlCollectionState.LoadState (this.UniqueID, this);
  
  			if (_controlState == null)
--- 313,322 ----
  			//note:only for NoStore mode
  			_controlState.SetControlIDs(_controlHtmlHashes);  
! 			_controlState.Save (this.ClientID, this.Page);
  		}
  
  		protected virtual void LoadControlState()
  		{
! 			_controlState = ControlCollectionState.LoadState (this.ClientID, this);
  
  			if (_controlState == null)
***************
*** 472,476 ****
  							if (htmlHashCode != (string)_controlHtmlHashes[con])
  							{
! 								AjaxCallHelper.WriteSetHtmlOfElementScript(html, GetAjaxElemID(con));
  								_controlHtmlHashes[con] = htmlHashCode;
  							}
--- 472,476 ----
  							if (htmlHashCode != (string)_controlHtmlHashes[con])
  							{
! 								ExtendedWriteSetHtmlOfElementScript(html, GetAjaxElemID(con));
  								_controlHtmlHashes[con] = htmlHashCode;
  							}
***************
*** 751,759 ****
  			/// Loads the ControlCollectionState from the hidden form element
  			/// </summary>
! 			/// <param name="panelUniqueID"></param>
  			/// <returns></returns>
! 			public static ControlCollectionState LoadState(string panelUniqueID, Control owner)
  			{
! 				string panelKey = GetControlFingerprintsField(panelUniqueID);
  				string panelControlStates = HttpContext.Current.Request.Form[panelKey];
  				if (panelControlStates != null)
--- 751,759 ----
  			/// Loads the ControlCollectionState from the hidden form element
  			/// </summary>
! 			/// <param name="panelClientID"></param>
  			/// <returns></returns>
! 			public static ControlCollectionState LoadState(string panelClientID, Control owner)
  			{
! 				string panelKey = GetControlFingerprintsField(panelClientID);
  				string panelControlStates = HttpContext.Current.Request.Form[panelKey];
  				if (panelControlStates != null)
***************
*** 765,769 ****
  						string namevaluepair = namevaluepairs[i];
  						string[] namevalue = namevaluepair.Split('#');
! 						controlIDHtmlHashes.Add(string.Format("{0}_{1}", panelUniqueID, namevalue[0]), namevalue[1]);
  					}
  
--- 765,769 ----
  						string namevaluepair = namevaluepairs[i];
  						string[] namevalue = namevaluepair.Split('#');
! 						controlIDHtmlHashes.Add(string.Format("{0}_{1}", panelClientID, namevalue[0]), namevalue[1]);
  					}
  
***************
*** 779,787 ****
  			/// Returns the ClientID of the hidden field containing the Control fingerprints for given panel
  			/// </summary>
! 			/// <param name="panelUniqueID"></param>
  			/// <returns></returns>
! 			public static string GetControlFingerprintsField(string panelUniqueID)
  			{
! 				return string.Format("__CONTROL_FINGERPRINTS_{0}", panelUniqueID);
  			}
  
--- 779,787 ----
  			/// Returns the ClientID of the hidden field containing the Control fingerprints for given panel
  			/// </summary>
! 			/// <param name="panelClientID"></param>
  			/// <returns></returns>
! 			public static string GetControlFingerprintsField(string panelClientID)
  			{
! 				return string.Format("__CONTROL_FINGERPRINTS_{0}", panelClientID);
  			}
  
***************
*** 802,808 ****
  			/// When in AjaxCall mode, creates SetFieldScript to set hidden field when last ControlState hashes were changed.
  			/// </summary>
! 			/// <param name="panelUniqueID"></param>
  			/// <param name="page"></param>
! 			public void Save(string panelUniqueID, Page page)
  			{
  				System.Text.StringBuilder sbuilder = new System.Text.StringBuilder();
--- 802,808 ----
  			/// When in AjaxCall mode, creates SetFieldScript to set hidden field when last ControlState hashes were changed.
  			/// </summary>
! 			/// <param name="panelClientID"></param>
  			/// <param name="page"></param>
! 			public void Save(string panelClientID, Page page)
  			{
  				System.Text.StringBuilder sbuilder = new System.Text.StringBuilder();
***************
*** 815,819 ****
  					}
  
! 					string keyWithoutNamingcontainer = key.Substring(panelUniqueID.Length + 1);
  
  					sbuilder.AppendFormat("{0}#{1}", keyWithoutNamingcontainer, _controlIDHtmlHashes[key]);
--- 815,819 ----
  					}
  
! 					string keyWithoutNamingcontainer = key.Substring(panelClientID.Length + 1);
  
  					sbuilder.AppendFormat("{0}#{1}", keyWithoutNamingcontainer, _controlIDHtmlHashes[key]);
***************
*** 821,825 ****
  
  				string serializedPanelStateHashes = sbuilder.ToString();
! 				string panelKey = GetControlFingerprintsField(panelUniqueID);
  
  				if ( AjaxCallHelper.IsAjaxCallForPage(_owner.Page) )
--- 821,825 ----
  
  				string serializedPanelStateHashes = sbuilder.ToString();
! 				string panelKey = GetControlFingerprintsField(panelClientID);
  
  				if ( AjaxCallHelper.IsAjaxCallForPage(_owner.Page) )