[Magicajax-cvs] magicajax/Core/UI/Controls AjaxPanel.cs,1.24,1.25

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

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

Modified Files:
	AjaxPanel.cs 
Log Message:
Removed INaminContainer from AjaxPanel. Now that only WebControls are enclosed inside marker tags, there's no need for AjaxPanel to be a container; it will be confusing to the developers.

Index: AjaxPanel.cs
===================================================================
RCS file: /cvsroot/magicajax/magicajax/Core/UI/Controls/AjaxPanel.cs,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** AjaxPanel.cs	26 Nov 2005 12:14:41 -0000	1.24
--- AjaxPanel.cs	29 Nov 2005 01:11:30 -0000	1.25
***************
*** 76,80 ****
  	PersistChildren(true),
  	ToolboxData("<{0}:AjaxPanel runat=server>AjaxPanel</{0}:AjaxPanel>")]
! 	public class AjaxPanel : RenderedByScriptControl, IFormDataLoadedEventHandler, INamingContainer
  	{
  		#region Fields
--- 76,80 ----
  	PersistChildren(true),
  	ToolboxData("<{0}:AjaxPanel runat=server>AjaxPanel</{0}:AjaxPanel>")]
! 	public class AjaxPanel : RenderedByScriptControl, IFormDataLoadedEventHandler
  	{
  		#region Fields
***************
*** 402,428 ****
  			}
  
! 			// Find removed controls
  			_removedControls.Clear();
- 			foreach (string clientID in _controlState.ControlHtmlFingerprints.Keys)
- 			{
- 				int i;
- 				for (i=0; i < this.Controls.Count; i++)
- 				{
- 					if (this.Controls[i].ClientID == clientID)
- 						break;
- 				}
- 
- 				if (i == this.Controls.Count)
- 				{
- 					// The control is removed. Add a control with the same id
- 					// so that RenderByScript "removes" it from page
- 					if ( clientID.StartsWith (this.ClientID) )
- 					{
- 						Literal lit = new Literal();
- 						lit.ID = clientID.Substring(this.ClientID.Length + 1);
- 						_removedControls.Add (lit);
- 					}
- 				}
- 			}
  		}
  
--- 402,409 ----
  			}
  
! 			// Removed controls do not render their 'marker tags' and will be removed from
! 			// page when literal content is rendered. So there's no need to
! 			// explicitly send javascript command to remove a control.
  			_removedControls.Clear();
  		}
  
***************
*** 982,990 ****
  							if (MagicAjaxContext.Current.Configuration.CompareMode == MagicAjax.Configuration.OutputCompareMode.FullHtml)
  							{
! 								controlHtmlFingerprints.Add(string.Format("{0}_{1}", panelClientID, namevalue[0]), UnicodeEncoding.Default.GetString(Convert.FromBase64String(namevalue[1])));
  							}
  							else
  							{
! 								controlHtmlFingerprints.Add(string.Format("{0}_{1}", panelClientID, namevalue[0]), namevalue[1]);
  							}
  						}
--- 963,971 ----
  							if (MagicAjaxContext.Current.Configuration.CompareMode == MagicAjax.Configuration.OutputCompareMode.FullHtml)
  							{
! 								controlHtmlFingerprints.Add(namevalue[0], UnicodeEncoding.Default.GetString(Convert.FromBase64String(namevalue[1])));
  							}
  							else
  							{
! 								controlHtmlFingerprints.Add(namevalue[0], namevalue[1]);
  							}
  						}
***************
*** 1051,1063 ****
  					sbuilder.Append(';');
  
- 					string keyWithoutNamingcontainer = key.Substring(panelClientID.Length + 1);
- 
  					if (MagicAjaxContext.Current.Configuration.CompareMode == MagicAjax.Configuration.OutputCompareMode.FullHtml)
  					{
! 						sbuilder.AppendFormat("{0}#{1}", keyWithoutNamingcontainer, Convert.ToBase64String(UnicodeEncoding.Default.GetBytes((string)_controlHtmlFingerprints[key])));
  					}
  					else
  					{
! 						sbuilder.AppendFormat("{0}#{1}", keyWithoutNamingcontainer, _controlHtmlFingerprints[key]);
  					}
  				}
--- 1032,1042 ----
  					sbuilder.Append(';');
  
  					if (MagicAjaxContext.Current.Configuration.CompareMode == MagicAjax.Configuration.OutputCompareMode.FullHtml)
  					{
! 						sbuilder.AppendFormat("{0}#{1}", key, Convert.ToBase64String(UnicodeEncoding.Default.GetBytes((string)_controlHtmlFingerprints[key])));
  					}
  					else
  					{
! 						sbuilder.AppendFormat("{0}#{1}", key, _controlHtmlFingerprints[key]);
  					}
  				}