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

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

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

Modified Files:
	AjaxCallHelper.cs 
Log Message:
Fix: handle ASP.NET 2.0 WebPartManager scripts seperately (not handled as the other scripts)

Index: AjaxCallHelper.cs
===================================================================
RCS file: /cvsroot/magicajax/magicajax/Core/AjaxCallHelper.cs,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** AjaxCallHelper.cs	29 Jan 2006 23:06:50 -0000	1.25
--- AjaxCallHelper.cs	29 Jan 2006 23:36:58 -0000	1.26
***************
*** 794,799 ****
  				foreach (DictionaryEntry fld in regScripts)
  				{
! 					int keyHash = fld.Key.GetHashCode();
  					string script = (string)fld.Value;
  					string scriptFP = Util.GetFingerprint(string.Format("{0}:{1}", keyHash, script));
  
--- 794,810 ----
  				foreach (DictionaryEntry fld in regScripts)
  				{
! 					int keyHash = -1;
! 					try 
! 					{
! 						keyHash = fld.Key.GetHashCode();
! 					}
! 					catch (NullReferenceException) {}
  					string script = (string)fld.Value;
+ 
+ #if NET_2_0			
+ 					//don't handle WebPartManager scripts (we're handling them seperately later on)
+ 					if (script != null && (script.Contains("__wpm = new WebPartManager") || script.Contains("var menuWebPart_")))
+ 						continue;
+ #endif		
  					string scriptFP = Util.GetFingerprint(string.Format("{0}:{1}", keyHash, script));