Update of /cvsroot/magicajax/magicajax/Core/UI/Controls
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31248/Core/UI/Controls
Modified Files:
AjaxPanel.cs
Log Message:
Merged the changes from STABLE to HEAD
Index: AjaxPanel.cs
===================================================================
RCS file: /cvsroot/magicajax/magicajax/Core/UI/Controls/AjaxPanel.cs,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** AjaxPanel.cs 2 Dec 2005 08:25:10 -0000 1.27
--- AjaxPanel.cs 4 Dec 2005 03:25:15 -0000 1.28
***************
*** 401,411 ****
foreach (Control con in this.Controls)
{
! if (_controlState.ControlHtmlFingerprints.ContainsKey(con.ClientID))
! {
! _controlHtmlFingerprints[con] = _controlState.ControlHtmlFingerprints[con.ClientID];
! }
! else
{
! _addedControls.Add (con);
}
}
--- 401,414 ----
foreach (Control con in this.Controls)
{
! if ( con is WebControl )
{
! if (_controlState.ControlHtmlFingerprints.ContainsKey(con.ClientID))
! {
! _controlHtmlFingerprints[con] = _controlState.ControlHtmlFingerprints[con.ClientID];
! }
! else
! {
! _addedControls.Add (con);
! }
}
}
***************
*** 756,760 ****
#endregion
! #region Validator methods
/// <summary>
/// Clears 'display' and 'visibility' styles from all the validators.
--- 759,763 ----
#endregion
! #region Validators
/// <summary>
/// Clears 'display' and 'visibility' styles from all the validators.
|
