[Magicajax-cvs] magicajax/Core/script AjaxCallObject.js,1.21,1.22

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

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

Modified Files:
	AjaxCallObject.js 
Log Message:
Tracing reuses the same trace window.
Replaced keeping/restoring the page's form html with the previous implementation of RBS_Control_Stores.
Some corrections to allow compilation for NET 1.1 and CustomControls.

Index: AjaxCallObject.js
===================================================================
RCS file: /cvsroot/magicajax/magicajax/Core/script/AjaxCallObject.js,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** AjaxCallObject.js	23 Nov 2005 09:05:06 -0000	1.21
--- AjaxCallObject.js	23 Nov 2005 19:34:23 -0000	1.22
***************
*** 1,5 ****
  __AJAXCboList = new Array();
  __bPageIsStored = false;
- __PageStateCacheName = null;
  __bTracing = false;
  __PreviousOnFormSubmit = null;
--- 1,4 ----
***************
*** 62,66 ****
  }
  
! AjaxCallObject.prototype.HookAjaxCall = function(bPageIsStored, bUnloadStoredPage, pageStateCacheName, bTracing)
  {
  	__PreviousOnFormSubmit = document.forms[0].onsubmit;
--- 61,65 ----
  }
  
! AjaxCallObject.prototype.HookAjaxCall = function(bPageIsStored, bUnloadStoredPage, bTracing)
  {
  	__PreviousOnFormSubmit = document.forms[0].onsubmit;
***************
*** 74,81 ****
  	
  	__bPageIsStored = bPageIsStored;
- 	__PageStateCacheName = pageStateCacheName;
  	__bTracing = bTracing;
  
! 	document.forms[0][__PageStateCacheName].setAttribute("ExcludeFromPost", "true");
  
  	if ( !bPageIsStored || !bUnloadStoredPage )
--- 73,83 ----
  	
  	__bPageIsStored = bPageIsStored;
  	__bTracing = bTracing;
  
! 	if (typeof(RBS_Controls) != "undefined")
! 	{
! 		for (var i=0; i < RBS_Controls.length; i++)
! 			RBS_Controls_Store[i].setAttribute("ExcludeFromPost", "true");
! 	}
  
  	if ( !bPageIsStored || !bUnloadStoredPage )
***************
*** 86,89 ****
--- 88,98 ----
  		__PreviousOnPageBeforeUnload = window.onbeforeunload;
  		window.onbeforeunload = this.OnPageBeforeUnload;
+ 
+ 		__PreviousOnPageUnload = window.onunload;
+ 		window.onunload = function() {
+ 			AJAXCbo.ClearTracingWindows();
+ 			if (__PreviousOnPageUnload != null)
+ 				__PreviousOnPageUnload();
+ 		}
  	}
  	else
***************
*** 96,101 ****
  AjaxCallObject.prototype.OnFormSubmit = function()
  {
! 	AJAXCbo.ClearTracingWindows();
! 	document.forms[0][__PageStateCacheName].value = "";
  
  	var target;
--- 105,114 ----
  AjaxCallObject.prototype.OnFormSubmit = function()
  {
! 	// Empty the cached html of RenderedByScript controls
! 	if (typeof(RBS_Controls) != "undefined")
! 	{
! 		for (var i=0; i < RBS_Controls.length; i++)
! 			RBS_Controls_Store[i].value = "";
! 	}
  
  	var target;
***************
*** 123,126 ****
--- 136,140 ----
  	else
  	{
+ 		AJAXCbo.ClearTracingWindows();
  		return true;
  	}
***************
*** 130,135 ****
  AjaxCallObject.prototype.DoPostBack = function(eventTarget, eventArgument)
  {
! 	AJAXCbo.ClearTracingWindows();
! 	document.forms[0][__PageStateCacheName].value = "";
  
  	var target;
--- 144,153 ----
  AjaxCallObject.prototype.DoPostBack = function(eventTarget, eventArgument)
  {
! 	// Empty the cached html of RenderedByScript controls
! 	if (typeof(RBS_Controls) != "undefined")
! 	{
! 		for (var i=0; i < RBS_Controls.length; i++)
! 			RBS_Controls_Store[i].value = "";
! 	}
  
  	var target;
***************
*** 161,165 ****
--- 179,186 ----
  	{
  		if (__PreviousPostBack != null)
+ 		{
+ 			AJAXCbo.ClearTracingWindows();
  			__PreviousPostBack(eventTarget, eventArgument);
+ 		}
  	}
  }
***************
*** 167,178 ****
  AjaxCallObject.prototype.OnPageLoad = function()
  {
! 	// Restore the html of form
! 	var html = document.forms[0][__PageStateCacheName].value;
! 	if (html != "")
  	{
! 		document.forms[0].innerHTML = decodeURIComponent(html.substr(5));
! 		document.forms[0][__PageStateCacheName].value = "";
  	}
- 
  	if (__PreviousOnPageLoad != null)
  		return __PreviousOnPageLoad();
--- 188,204 ----
  AjaxCallObject.prototype.OnPageLoad = function()
  {
! 	// Restore the html of RenderedByScript controls
! 	if (typeof(RBS_Controls) != "undefined")
  	{
! 		for (var i=0; i < RBS_Controls.length; i++)
! 		{
! 			var html = RBS_Controls_Store[i].value;
! 			if (html != "")
! 			{
! 				RBS_Controls[i].innerHTML = decodeURIComponent(html.substring(5, html.length));
! 				RBS_Controls_Store[i].value = "";
! 			}
! 		}
  	}
  	if (__PreviousOnPageLoad != null)
  		return __PreviousOnPageLoad();
***************
*** 181,188 ****
  AjaxCallObject.prototype.OnPageBeforeUnload = function()
  {
! 	// Will be null if an Error page is displayed.
! 	if (document.forms[0][__PageStateCacheName] != null)
! 		document.forms[0][__PageStateCacheName].value = "HTML:" + encodeURIComponent(document.forms[0].innerHTML);
! 		
  	if (__PreviousOnPageBeforeUnload != null)
  		return __PreviousOnPageBeforeUnload();
--- 207,217 ----
  AjaxCallObject.prototype.OnPageBeforeUnload = function()
  {
! 	// Save the html of RenderedByScript controls, so that it can be restored for the
! 	// browser's "Back Button"
! 	if (typeof(RBS_Controls) != "undefined")
! 	{
! 		for (var i=0; i < RBS_Controls.length; i++)
! 			RBS_Controls_Store[i].value = "HTML:" + encodeURIComponent(RBS_Controls[i].innerHTML);
! 	}
  	if (__PreviousOnPageBeforeUnload != null)
  		return __PreviousOnPageBeforeUnload();
***************
*** 191,194 ****
--- 220,225 ----
  AjaxCallObject.prototype.OnPageUnload = function()
  {
+ 	AJAXCbo.ClearTracingWindows();
+ 	
  	if (document.forms[0]["__AJAX_PAGEKEY"] == null)
  		return;
***************
*** 432,437 ****
  AjaxCallObject.prototype.CreateTracingWindow = function()
  {
! 	this.TraceWindow = window.open("","_blank","location=no,resizable=yes,scrollbars=yes");
! 	__TraceWindows.push(this.TraceWindow);
  }
  
--- 463,480 ----
  AjaxCallObject.prototype.CreateTracingWindow = function()
  {
! 	this.TraceWindow = null;
! 	for (var i=0; i < __TraceWindows.length; i++)
! 	{
! 		if (__TraceWindows[i].TraceFinished)
! 		{
! 			this.TraceWindow = __TraceWindows[i];
! 		}		
! 	}
! 	
! 	if (this.TraceWindow == null)
! 	{
! 		this.TraceWindow = window.open("","_blank","location=no,resizable=yes,scrollbars=yes");
! 		__TraceWindows.push(this.TraceWindow);
! 	}
  }
  
***************
*** 440,449 ****
  	for (var i=0; i < __TraceWindows.length; i++)
  	{
! 		if (__TraceWindows[i].closed || __TraceWindows[i].TraceFinished)
! 		{
! 			__TraceWindows[i].close();
! 			__TraceWindows.splice(i, 1);
! 			i--;
! 		}
  	}
  }
--- 483,489 ----
  	for (var i=0; i < __TraceWindows.length; i++)
  	{
! 		__TraceWindows[i].close();
! 		__TraceWindows.splice(i, 1);
! 		i--;
  	}
  }