[Magicajax-cvs] magicajax/Core/UI AjaxControl.cs,1.7,1.8 AjaxPage.cs,1.6,1.7 AjaxUserControl.cs,1.6,1.7

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

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

Modified Files:
	AjaxControl.cs AjaxPage.cs AjaxUserControl.cs 
Log Message:
Major changes to enable MagicAjax for concurrent users.
Added: MagicAjaxContext class (containing properties like 'IsAjaxCall')
Added: PageFilter.cs (just moved the PageFilter class from MagicAjaxModule.cs)

Index: AjaxUserControl.cs
===================================================================
RCS file: /cvsroot/magicajax/magicajax/Core/UI/AjaxUserControl.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** AjaxUserControl.cs	20 Nov 2005 08:47:29 -0000	1.6
--- AjaxUserControl.cs	23 Nov 2005 15:12:48 -0000	1.7
***************
*** 73,77 ****
  		public bool IsAjaxCall
  		{
! 			get { return AjaxCallHelper.IsAjaxCallForPage(this.Page); }
  		}
  
--- 73,77 ----
  		public bool IsAjaxCall
  		{
! 			get { return MagicAjaxContext.Current.IsAjaxCallForPage(this.Page); }
  		}
  

Index: AjaxPage.cs
===================================================================
RCS file: /cvsroot/magicajax/magicajax/Core/UI/AjaxPage.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** AjaxPage.cs	20 Nov 2005 08:47:29 -0000	1.6
--- AjaxPage.cs	23 Nov 2005 15:12:48 -0000	1.7
***************
*** 73,77 ****
  		public bool IsAjaxCall
  		{
! 			get { return AjaxCallHelper.IsAjaxCallForPage(this); }
  		}
  
--- 73,77 ----
  		public bool IsAjaxCall
  		{
! 			get { return HttpContext.Current != null && MagicAjaxContext.Current.IsAjaxCallForPage(this); }
  		}
  

Index: AjaxControl.cs
===================================================================
RCS file: /cvsroot/magicajax/magicajax/Core/UI/AjaxControl.cs,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** AjaxControl.cs	22 Nov 2005 15:14:20 -0000	1.7
--- AjaxControl.cs	23 Nov 2005 15:12:48 -0000	1.8
***************
*** 62,66 ****
  		public bool IsPageNoStoreMode
  		{
! 			get { return AjaxCallHelper.IsPageNoStoreMode; }
  		}
  
--- 62,66 ----
  		public bool IsPageNoStoreMode
  		{
! 			get { return HttpContext.Current != null && MagicAjaxContext.Current.IsPageNoStoreMode; }
  		}
  
***************
*** 71,75 ****
  		public bool IsAjaxCall
  		{
! 			get { return ( HttpContext.Current != null && this.Page != null && AjaxCallHelper.IsAjaxCallForPage(this.Page) ); } 
  		}
  
--- 71,75 ----
  		public bool IsAjaxCall
  		{
! 			get { return (HttpContext.Current != null && this.Page != null && MagicAjaxContext.Current.IsAjaxCallForPage(this.Page)); } 
  		}
  
***************
*** 84,92 ****
  		{
  			// Register 'AjaxCallObject.js' script
! 			MagicAjaxModule.Instance.EnableAjaxOnPage(this.Page);
  
  #if NET_2_0
  			// add WebPartManager script (AddWebPartClientFunctions will check if this page is a WebPartPage)
! 			MagicAjaxModule.Instance.AddWebPartClientFunctions(this.Page);
  #endif
  
--- 84,92 ----
  		{
  			// Register 'AjaxCallObject.js' script
! 			MagicAjaxModule.EnableAjaxOnPage(this.Page);
  
  #if NET_2_0
  			// add WebPartManager script (AddWebPartClientFunctions will check if this page is a WebPartPage)
! 			MagicAjaxModule.AddWebPartClientFunctions(this.Page);
  #endif