[Magicajax-cvs] magicajax/Core MagicAjax.snk,NONE,1.1 MagicAjax NET 2.0.csproj,1.10,1.11 MagicAjaxModule.cs,1.49,1.50

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

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

Modified Files:
	MagicAjax NET 2.0.csproj MagicAjaxModule.cs 
Added Files:
	MagicAjax.snk 
Log Message:
- Updated MagicAjaxModule, so non-Page HttpHandlers are allowed
- Added strongname key (Public Key token = bf4053b35db106f3)

Index: MagicAjax NET 2.0.csproj
===================================================================
RCS file: /cvsroot/magicajax/magicajax/Core/MagicAjax NET 2.0.csproj,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** MagicAjax NET 2.0.csproj	18 Dec 2005 16:44:46 -0000	1.10
--- MagicAjax NET 2.0.csproj	22 Dec 2005 12:19:32 -0000	1.11
***************
*** 12,17 ****
      </AssemblyKeyContainerName>
      <AssemblyName>MagicAjax</AssemblyName>
!     <AssemblyOriginatorKeyFile>
!     </AssemblyOriginatorKeyFile>
      <DefaultClientScript>JScript</DefaultClientScript>
      <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
--- 12,16 ----
      </AssemblyKeyContainerName>
      <AssemblyName>MagicAjax</AssemblyName>
!     <AssemblyOriginatorKeyFile>MagicAjax.snk</AssemblyOriginatorKeyFile>
      <DefaultClientScript>JScript</DefaultClientScript>
      <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
***************
*** 27,30 ****
--- 26,30 ----
      <UpgradeBackupLocation>
      </UpgradeBackupLocation>
+     <SignAssembly>true</SignAssembly>
    </PropertyGroup>
    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
***************
*** 160,163 ****
--- 160,166 ----
      <Content Include="Web.config" />
    </ItemGroup>
+   <ItemGroup>
+     <None Include="MagicAjax.snk" />
+   </ItemGroup>
    <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
    <PropertyGroup>

--- NEW FILE: MagicAjax.snk ---
(This appears to be a binary file; contents omitted.)

Index: MagicAjaxModule.cs
===================================================================
RCS file: /cvsroot/magicajax/magicajax/Core/MagicAjaxModule.cs,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** MagicAjaxModule.cs	22 Dec 2005 01:26:25 -0000	1.49
--- MagicAjaxModule.cs	22 Dec 2005 12:19:32 -0000	1.50
***************
*** 433,437 ****
  			HttpApplication application = (HttpApplication) sender;
  
! 			if (!(HttpContext.Current.Handler is Page))
  			{
  				return; //if this wasn't a .aspx request, don't process
--- 433,437 ----
  			HttpApplication application = (HttpApplication) sender;
  
! 			if (!_request.Url.AbsolutePath.EndsWith(".aspx"))
  			{
  				return; //if this wasn't a .aspx request, don't process
***************
*** 448,462 ****
  			}
  
! 			Page requestPage = (Page)HttpContext.Current.Handler;
  
  #if NET_2_0
- 			// For ASP.NET 2.0, disable event validation on the page 
- 			requestPage.EnableEventValidation = false;
- 			//TODO: check if there is another way to avoid the event-validation exceptions in the controls
- #endif
  
! 			// Continue only if it is a postback or an AjaxCall
! 			if ( "GET" == _request.HttpMethod )
! 				return;
  
  			_magicAjaxContext.IsAjaxCall = (_request.Form["__AJAXCALL"] != null);
--- 448,466 ----
  			}
  
! 			// Continue only if it is a postback or an AjaxCall
! 			if ("GET" == _request.HttpMethod)
! 				return;
! 
! 			Page currentPage = HttpContext.Current.Handler as Page;
  
  #if NET_2_0
  
! 			if (currentPage != null)
! 			{
! 				// For ASP.NET 2.0, disable event validation on the page 
! 				currentPage.EnableEventValidation = false;
! 				//TODO: check if there is another way to avoid the event-validation exceptions in the controls
! 			}
! #endif
  
  			_magicAjaxContext.IsAjaxCall = (_request.Form["__AJAXCALL"] != null);
***************
*** 487,495 ****
  					try
  					{
! 						if ( viewStateIsExcluded )
  						{
  							// ViewState is excluded from the post data. Disable it on
  							// the page since its value will not be sent to client.
! 							(HttpContext.Current.Handler as Page).EnableViewState = false;
  						}
  
--- 491,499 ----
  					try
  					{
! 						if (viewStateIsExcluded && currentPage != null)
  						{
  							// ViewState is excluded from the post data. Disable it on
  							// the page since its value will not be sent to client.
! 							currentPage.EnableViewState = false;
  						}
  
***************
*** 622,630 ****
  
  #if NET_2_0
  						// Check if this request is to add/remove/replace a WebPart
  						// If so, send back updated WebPartManager drag&drop javascript (IE only)
! 						if (!string.IsNullOrEmpty(_request.Form["__WPPS"]))
  						{
! 							string wpmValue = _filter.GetWebPartManagerScriptValue((HttpContext.Current.Handler as Page).Form.ClientID);
  							if (wpmValue != null)
  							{
--- 626,636 ----
  
  #if NET_2_0
+ 						Page currentPage = HttpContext.Current.Handler as Page;
+ 
  						// Check if this request is to add/remove/replace a WebPart
  						// If so, send back updated WebPartManager drag&drop javascript (IE only)
! 						if (!string.IsNullOrEmpty(_request.Form["__WPPS"]) && currentPage != null)
  						{
! 							string wpmValue = _filter.GetWebPartManagerScriptValue(currentPage.Form.ClientID);
  							if (wpmValue != null)
  							{