[Magicajax-cvs] magicajax/Core MagicAjaxModule.cs,1.22,1.23

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

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

Modified Files:
	MagicAjaxModule.cs 
Log Message:
Minor modification for Page state cache and IsMagicAjaxSupportedBrowser.

Index: MagicAjaxModule.cs
===================================================================
RCS file: /cvsroot/magicajax/magicajax/Core/MagicAjaxModule.cs,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** MagicAjaxModule.cs	21 Nov 2005 13:39:48 -0000	1.22
--- MagicAjaxModule.cs	21 Nov 2005 16:32:42 -0000	1.23
***************
*** 148,156 ****
  				if (caps.Browser != null && caps.EcmaScriptVersion.Major >=1 && caps.W3CDomVersion.Major >= 1)
  				{
! 					switch (caps.Browser.ToLowerInvariant())
  					{
  						case "ie":
  							isSupported = caps.MajorVersion >5 || (caps.MajorVersion == 5 && caps.MinorVersion >= 5);
  							break;
  						case "firefox":
  							isSupported = caps.MajorVersion >= 1;
--- 148,159 ----
  				if (caps.Browser != null && caps.EcmaScriptVersion.Major >=1 && caps.W3CDomVersion.Major >= 1)
  				{
! 					switch (caps.Browser.ToLower())
  					{
  						case "ie":
  							isSupported = caps.MajorVersion >5 || (caps.MajorVersion == 5 && caps.MinorVersion >= 5);
  							break;
+ 						case "gecko":
+ 							isSupported = caps.Type.ToLower().StartsWith("firefox") && caps.MajorVersion >= 1;
+ 							break;
  						case "firefox":
  							isSupported = caps.MajorVersion >= 1;
***************
*** 175,183 ****
  			if (page == null || AjaxCallHelper.IsAjaxCallForPage(page)) return;
  
- 			// Enable AJAX only MagicAjax-supported browsers.
- 			// Other browsers will get a plain postback page.
- 			if (!IsMagicAjaxSupportedBrowser())
- 				return;
- 
  			string STARTUP_SCRIPT_FORMAT = @"
  			<script language='javascript'>
--- 178,181 ----
***************
*** 190,193 ****
--- 188,196 ----
  			if (!page.IsClientScriptBlockRegistered( "AJAXCALL_FOR_MAGICAJAX" )) 
  			{            
+ 				// Enable AJAX only MagicAjax-supported browsers.
+ 				// Other browsers will get a plain postback page.
+ 				if (!IsMagicAjaxSupportedBrowser())
+ 					return;
+ 
  				// Provides the location of the script file.
  				string location = _config.ScriptPath;
***************
*** 245,249 ****
  
  				bool unloadStoredPage = _config.PageStore.UnloadStoredPage;
! 				page.RegisterStartupScript( "AJAXCALL_HOOK", String.Format(STARTUP_SCRIPT_FORMAT, location, "AjaxCallObject.js", pageIsStored.ToString().ToLower(), unloadStoredPage.ToString().ToLower(), String.Format("document.forms[0][\"{0}\"]", pageStateCacheName), _config.Tracing.ToString().ToLower()));
  			}
  		}
--- 248,252 ----
  
  				bool unloadStoredPage = _config.PageStore.UnloadStoredPage;
! 				page.RegisterStartupScript( "AJAXCALL_HOOK", String.Format(STARTUP_SCRIPT_FORMAT, location, "AjaxCallObject.js", pageIsStored.ToString().ToLower(), unloadStoredPage.ToString().ToLower(), AjaxCallHelper.EncodeString(pageStateCacheName), _config.Tracing.ToString().ToLower()));
  			}
  		}