[Magicajax-cvs] magicajax/Core/script AjaxCallObject.js,1.28,1.29

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

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

Modified Files:
	AjaxCallObject.js 
Log Message:
Merged the changes from STABLE to HEAD

Index: AjaxCallObject.js
===================================================================
RCS file: /cvsroot/magicajax/magicajax/Core/script/AjaxCallObject.js,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** AjaxCallObject.js	2 Dec 2005 09:58:04 -0000	1.28
--- AjaxCallObject.js	4 Dec 2005 03:25:15 -0000	1.29
***************
*** 1,4 ****
--- 1,5 ----
  __AJAXCboList = new Array();
  __bPageIsStored = false;
+ __bUnloadStoredPage = false;
  __bTracing = false;
  __PreviousOnFormSubmit = null;
***************
*** 8,11 ****
--- 9,13 ----
  __PreviousOnPageUnload = null;
  __TraceWindows = new Array();
+ __ClockID = 0;
  
  function AjaxCallObject()
***************
*** 73,76 ****
--- 75,79 ----
  	
  	__bPageIsStored = bPageIsStored;
+ 	__bUnloadStoredPage = bUnloadStoredPage;
  	__bTracing = bTracing;
  
***************
*** 88,104 ****
  		__PreviousOnPageBeforeUnload = window.onbeforeunload;
  		window.onbeforeunload = this.OnPageBeforeUnload;
- 
- 		__PreviousOnPageUnload = window.onunload;
- 		window.onunload = function() {
- 			AJAXCbo.ClearTracingWindows();
- 			if (__PreviousOnPageUnload != null)
- 				__PreviousOnPageUnload();
- 		}
- 	}
- 	else
- 	{
- 		__PreviousOnPageUnload = window.onunload;
- 		window.onunload = this.OnPageUnload;
  	}
  }
  
--- 91,98 ----
  		__PreviousOnPageBeforeUnload = window.onbeforeunload;
  		window.onbeforeunload = this.OnPageBeforeUnload;
  	}
+ 
+ 	__PreviousOnPageUnload = window.onunload;
+ 	window.onunload = this.OnPageUnload;
  }
  
***************
*** 180,184 ****
  		if (__PreviousPostBack != null)
  		{
- 			AJAXCbo.ClearTracingWindows();
  			__PreviousPostBack(eventTarget, eventArgument);
  		}
--- 174,177 ----
***************
*** 196,200 ****
  			if (html != "")
  			{
! 				RBS_Controls[i].innerHTML = decodeURIComponent(html.substring(5, html.length));
  				RBS_Controls_Store[i].value = "";
  			}
--- 189,193 ----
  			if (html != "")
  			{
! 				RBS_Controls[i].innerHTML = html.substring(5, html.length);
  				RBS_Controls_Store[i].value = "";
  			}
***************
*** 212,216 ****
  	{
  		for (var i=0; i < RBS_Controls.length; i++)
! 			RBS_Controls_Store[i].value = "HTML:" + encodeURIComponent(RBS_Controls[i].innerHTML);
  	}
  	if (__PreviousOnPageBeforeUnload != null)
--- 205,209 ----
  	{
  		for (var i=0; i < RBS_Controls.length; i++)
! 			RBS_Controls_Store[i].value = "HTML:" + RBS_Controls[i].innerHTML;
  	}
  	if (__PreviousOnPageBeforeUnload != null)
***************
*** 221,224 ****
--- 214,220 ----
  {
  	AJAXCbo.ClearTracingWindows();
+ 
+ 	if ( !__bPageIsStored || !__bUnloadStoredPage )
+ 		return;
  	
  	if (document.forms[0]["__AJAX_PAGEKEY"] == null)
***************
*** 256,260 ****
  
    theData  = '__EVENTTARGET='  + escape(eventTarget.split("$").join(":")) + '&';
!   theData += '__EVENTARGUMENT=' + encodeURIComponent(eventArgument) + '&';
    theData += '__AJAXCALL=true&';
  
--- 252,256 ----
  
    theData  = '__EVENTTARGET='  + escape(eventTarget.split("$").join(":")) + '&';
!   theData += '__EVENTARGUMENT=' + this.EncodePostData(eventArgument) + '&';
    theData += '__AJAXCALL=true&';
  
***************
*** 276,280 ****
  			var val = theform.elements[i].value;
  
! 			if ( type == "submit" )
  				continue;
  
--- 272,276 ----
  			var val = theform.elements[i].value;
  
! 			if ( type == "submit" || type == "button" )
  				continue;
  
***************
*** 286,290 ****
  			}
  
! 			val = encodeURIComponent(val);
  
  			if ( type == "select-multiple" )
--- 282,286 ----
  			}
  
! 			val = this.EncodePostData(val);
  
  			if ( type == "select-multiple" )
***************
*** 292,296 ****
  				for (var j=0; j < theform.elements[i].options.length; j++)
  					if (theform.elements[i].options[j].selected)
! 						theData = theData + escape(eName) + '=' + encodeURIComponent(theform.elements[i].options[j].value) + '&';
  			}
  			else if ( (type != "checkbox" && type != "radio") || theform.elements[i].checked )
--- 288,292 ----
  				for (var j=0; j < theform.elements[i].options.length; j++)
  					if (theform.elements[i].options[j].selected)
! 						theData = theData + escape(eName) + '=' + this.EncodePostData(theform.elements[i].options[j].value) + '&';
  			}
  			else if ( (type != "checkbox" && type != "radio") || theform.elements[i].checked )
***************
*** 455,471 ****
  AjaxCallObject.prototype.TraceWindow = null;
  
- AjaxCallObject.prototype.ClockID = 0;
- 
  AjaxCallObject.prototype.SetIntervalForAjaxCall = function(milliSec)
  {
! 	if (this.ClockID)
  		this.ClearIntervalForAjaxCall();
! 	this.ClockID = window.setInterval("AJAXCbo.DoAjaxCall('__AJAX_AJAXCALLTIMER','','async')", milliSec);
  }
  
  AjaxCallObject.prototype.ClearIntervalForAjaxCall = function()
  {
! 	window.clearInterval(this.ClockID);
! 	this.ClockID = 0;
  }
  
--- 451,465 ----
  AjaxCallObject.prototype.TraceWindow = null;
  
  AjaxCallObject.prototype.SetIntervalForAjaxCall = function(milliSec)
  {
! 	if (__ClockID != 0)
  		this.ClearIntervalForAjaxCall();
! 	__ClockID = window.setInterval("AJAXCbo.DoAjaxCall('__AJAX_AJAXCALLTIMER','','async')", milliSec);
  }
  
  AjaxCallObject.prototype.ClearIntervalForAjaxCall = function()
  {
! 	window.clearInterval(__ClockID);
! 	__ClockID = 0;
  }
  
***************
*** 495,498 ****
--- 489,493 ----
  		__TraceWindows.push(this.TraceWindow);
  	}
+ 	this.TraceWindow.TraceFinished = false;
  }
  
***************
*** 519,523 ****
  	var fields = data.split("&");
  	for (var i=0; i < fields.length; i++)
! 		this.WriteTrace(decodeURIComponent(fields[i].split("<").join("&lt;")) + "<br>");
  		
  	this.WriteTrace("<b>------------------------------</b><br>");
--- 514,522 ----
  	var fields = data.split("&");
  	for (var i=0; i < fields.length; i++)
! 	{
! 		var parts = fields[i].split("=");
! 		this.WriteTrace("<b>" + parts[0] + "=</b>");
! 		this.WriteTrace(this.EncodeTraceData(parts[1]) + "<br>");
! 	}
  		
  	this.WriteTrace("<b>------------------------------</b><br>");
***************
*** 530,534 ****
  	this.WriteTrace("Javascript code received from server (" + data.length + " characters):<br>");
  	this.WriteTrace("------------------------------</b><br>");
! 	this.WriteTrace(data.split("<").join("&lt;").split("\r\n").join("<br>"));
  	this.WriteTrace("<b>------------------------------</b><br>");
  	this.CloseTrace();
--- 529,533 ----
  	this.WriteTrace("Javascript code received from server (" + data.length + " characters):<br>");
  	this.WriteTrace("------------------------------</b><br>");
! 	this.WriteTrace(this.EncodeTraceData(data));
  	this.WriteTrace("<b>------------------------------</b><br>");
  	this.CloseTrace();
***************
*** 546,549 ****
--- 545,558 ----
  }
  
+ AjaxCallObject.prototype.EncodeTraceData = function(data)
+ {
+ 	return data.split("<").join("&lt;").split(" ").join("&nbsp;").split("\r\n").join("<br>");
+ }
+ 
+ AjaxCallObject.prototype.EncodePostData = function(data)
+ {
+ 	return data.split("%").join("%25").split("=").join("%3d").split("&").join("%26").split("+").join("%2b");
+ }
+ 
  AjaxCallObject.prototype.SetAttributesOfControl = function(clientID, attributes)
  {