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

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

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

Modified Files:
	AjaxPanel.cs 
Log Message:
--Fixed the javascript errors that occured when the browser was not supported. Added a 'IsBrowserSupported' check before any MagicAjax specific additions on the page.
--An exception is thrown if MagicAjaxModule is not included in the HttpModules of web.config and the code tries to access MagicAjaxContext.Current
. MagicAjaxContext is being created by MagicAjaxModule at the BeginRequest event.
--Added 'MagicAjaxContext' protected property in AjaxControl, AjaxPage and AjaxUserControl classes and use it in the Ajax controls instead of MagicAjaxContext.Current

Index: AjaxPanel.cs
===================================================================
RCS file: /cvsroot/magicajax/magicajax/Core/UI/Controls/AjaxPanel.cs,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** AjaxPanel.cs	29 Nov 2005 01:11:30 -0000	1.25
--- AjaxPanel.cs	30 Nov 2005 12:22:29 -0000	1.26
***************
*** 238,242 ****
  			}
  
! 			Page.RegisterHiddenField (ControlCollectionState.GetControlFingerprintsField(this.ClientID), String.Empty);
  		}
  		#endregion
--- 238,245 ----
  			}
  
! 			if ( this.MagicAjaxContext.IsBrowserSupported )
! 			{
! 				Page.RegisterHiddenField (ControlCollectionState.GetControlFingerprintsField(this.ClientID), String.Empty);
! 			}
  		}
  		#endregion
***************
*** 908,917 ****
  			private string _literalFingerprint;
  			private SortedList _controlHtmlFingerprints;
! 			private Control _owner;
  
  			/// <summary>
  			/// Default ctor
  			/// </summary>
! 			public ControlCollectionState(Control owner)
  			{
  				_owner = owner;
--- 911,920 ----
  			private string _literalFingerprint;
  			private SortedList _controlHtmlFingerprints;
! 			private AjaxPanel _owner;
  
  			/// <summary>
  			/// Default ctor
  			/// </summary>
! 			public ControlCollectionState(AjaxPanel owner)
  			{
  				_owner = owner;
***************
*** 923,927 ****
  			/// </summary>
  			/// <param name="controlHtmlFingerprints"></param>
! 			public ControlCollectionState(string literalFingerprint, SortedList controlHtmlFingerprints, Control owner)
  			{
  				_owner = owner;
--- 926,930 ----
  			/// </summary>
  			/// <param name="controlHtmlFingerprints"></param>
! 			public ControlCollectionState(string literalFingerprint, SortedList controlHtmlFingerprints, AjaxPanel owner)
  			{
  				_owner = owner;
***************
*** 935,939 ****
  			/// <param name="panelClientID"></param>
  			/// <returns></returns>
! 			public static ControlCollectionState LoadState(string panelClientID, Control owner)
  			{
  				string panelKey = GetControlFingerprintsField(panelClientID);
--- 938,942 ----
  			/// <param name="panelClientID"></param>
  			/// <returns></returns>
! 			public static ControlCollectionState LoadState(string panelClientID, AjaxPanel owner)
  			{
  				string panelKey = GetControlFingerprintsField(panelClientID);
***************
*** 947,951 ****
  					{
  						string[] namevaluepairs = panelControlFingerprints.Split(';');
! 						if (MagicAjaxContext.Current.Configuration.CompareMode == MagicAjax.Configuration.OutputCompareMode.FullHtml)
  						{
  							literalFingerprint = UnicodeEncoding.Default.GetString(Convert.FromBase64String(namevaluepairs[0]));
--- 950,954 ----
  					{
  						string[] namevaluepairs = panelControlFingerprints.Split(';');
! 						if (owner.MagicAjaxContext.Configuration.CompareMode == MagicAjax.Configuration.OutputCompareMode.FullHtml)
  						{
  							literalFingerprint = UnicodeEncoding.Default.GetString(Convert.FromBase64String(namevaluepairs[0]));
***************
*** 961,965 ****
  							string[] namevalue = namevaluepair.Split('#');
  
! 							if (MagicAjaxContext.Current.Configuration.CompareMode == MagicAjax.Configuration.OutputCompareMode.FullHtml)
  							{
  								controlHtmlFingerprints.Add(namevalue[0], UnicodeEncoding.Default.GetString(Convert.FromBase64String(namevalue[1])));
--- 964,968 ----
  							string[] namevalue = namevaluepair.Split('#');
  
! 							if (owner.MagicAjaxContext.Configuration.CompareMode == MagicAjax.Configuration.OutputCompareMode.FullHtml)
  							{
  								controlHtmlFingerprints.Add(namevalue[0], UnicodeEncoding.Default.GetString(Convert.FromBase64String(namevalue[1])));
***************
*** 1019,1023 ****
  
  				// Put the literal content first, before the control/fingerprint pairs
! 				if (MagicAjaxContext.Current.Configuration.CompareMode == MagicAjax.Configuration.OutputCompareMode.FullHtml)
  				{
  					sbuilder.Append (Convert.ToBase64String(UnicodeEncoding.Default.GetBytes(LiteralFingerprint)));
--- 1022,1026 ----
  
  				// Put the literal content first, before the control/fingerprint pairs
! 				if (_owner.MagicAjaxContext.Configuration.CompareMode == MagicAjax.Configuration.OutputCompareMode.FullHtml)
  				{
  					sbuilder.Append (Convert.ToBase64String(UnicodeEncoding.Default.GetBytes(LiteralFingerprint)));
***************
*** 1032,1036 ****
  					sbuilder.Append(';');
  
! 					if (MagicAjaxContext.Current.Configuration.CompareMode == MagicAjax.Configuration.OutputCompareMode.FullHtml)
  					{
  						sbuilder.AppendFormat("{0}#{1}", key, Convert.ToBase64String(UnicodeEncoding.Default.GetBytes((string)_controlHtmlFingerprints[key])));
--- 1035,1039 ----
  					sbuilder.Append(';');
  
! 					if (_owner.MagicAjaxContext.Configuration.CompareMode == MagicAjax.Configuration.OutputCompareMode.FullHtml)
  					{
  						sbuilder.AppendFormat("{0}#{1}", key, Convert.ToBase64String(UnicodeEncoding.Default.GetBytes((string)_controlHtmlFingerprints[key])));
***************
*** 1045,1049 ****
  				string panelKey = GetControlFingerprintsField(panelClientID);
  
! 				if ( MagicAjaxContext.Current.IsAjaxCallForPage(_owner.Page) )
  				{
  					//if ajax callback, generate javascript to set panelfingerprints's hidden field value
--- 1048,1052 ----
  				string panelKey = GetControlFingerprintsField(panelClientID);
  
! 				if ( _owner.MagicAjaxContext.IsAjaxCallForPage(_owner.Page) )
  				{
  					//if ajax callback, generate javascript to set panelfingerprints's hidden field value
***************
*** 1053,1057 ****
  					}
  				}
! 				else
  				{
  					// The hidden field is already registered at OnLoad event.
--- 1056,1060 ----
  					}
  				}
! 				else if (_owner.MagicAjaxContext.IsBrowserSupported )
  				{
  					// The hidden field is already registered at OnLoad event.