magicajax-cvs

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

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

Modified Files:
      Tag: STABLE
	AjaxCallObject.js 
Log Message:
Added 'WriteFormat' and 'WriteLine' methods at AjaxCallHelper.cs

Index: AjaxCallObject.js
===================================================================
RCS file: /cvsroot/magicajax/magicajax/Core/script/AjaxCallObject.js,v
retrieving revision 1.29
retrieving revision 1.29.2.1
diff -C2 -d -r1.29 -r1.29.2.1
*** AjaxCallObject.js	4 Dec 2005 03:25:15 -0000	1.29
--- AjaxCallObject.js	5 Dec 2005 18:42:05 -0000	1.29.2.1
***************
*** 251,260 ****
    var eName = '';
  
!   theData  = '__EVENTTARGET='  + escape(eventTarget.split("$").join(":")) + '&';
    theData += '__EVENTARGUMENT=' + this.EncodePostData(eventArgument) + '&';
    theData += '__AJAXCALL=true&';
  
    if ( ! __bPageIsStored )
!       theData += '__VIEWSTATE=' + escape(theform.__VIEWSTATE.value).replace(new RegExp('\\+', 'g'), '%2b') + '&';
  
    for( var i=0; i<theform.elements.length; i++ )
--- 251,260 ----
    var eName = '';
  
!   theData  = '__EVENTTARGET='  + this.EncodePostData(eventTarget.split("$").join(":")) + '&';
    theData += '__EVENTARGUMENT=' + this.EncodePostData(eventArgument) + '&';
    theData += '__AJAXCALL=true&';
  
    if ( ! __bPageIsStored )
!       theData += '__VIEWSTATE=' + this.EncodePostData(theform.__VIEWSTATE.value) + '&';
  
    for( var i=0; i<theform.elements.length; i++ )
***************
*** 284,296 ****
  			val = this.EncodePostData(val);
  
! 			if ( type == "select-multiple" )
  			{
  				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 )
  			{
! 				theData = theData + escape(eName) + '=' + val;
  				if( i != theform.elements.length - 1 )
  					theData = theData + '&';
--- 284,296 ----
  			val = this.EncodePostData(val);
  
! 			if ( type == "select-multiple" || type == "select-one" )
  			{
  				for (var j=0; j < theform.elements[i].options.length; j++)
  					if (theform.elements[i].options[j].selected)
! 						theData = theData + this.EncodePostData(eName) + '=' + this.EncodePostData(theform.elements[i].options[j].value) + '&';
  			}
  			else if ( (type != "checkbox" && type != "radio") || theform.elements[i].checked )
  			{
! 				theData = theData + this.EncodePostData(eName) + '=' + val;
  				if( i != theform.elements.length - 1 )
  					theData = theData + '&';
***************
*** 375,379 ****
  
  	// Checking if the data were fully loaded, without being aborted
! 	var flag = "'AJAX_LOADING_OK';\r\n";
  	if (responseText.substr(responseText.length - flag.length) != flag)
  		return false;
--- 375,379 ----
  
  	// Checking if the data were fully loaded, without being aborted
! 	var flag = "'AJAX_LOADING_OK';";
  	if (responseText.substr(responseText.length - flag.length) != flag)
  		return false;
***************
*** 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();
--- 529,533 ----
  	this.WriteTrace("Javascript code received from server (" + data.length + " characters):<br>");
  	this.WriteTrace("------------------------------</b><br>");
! 	this.WriteTrace(this.EncodeTraceData(data) + "<br>");
  	this.WriteTrace("<b>------------------------------</b><br>");
  	this.CloseTrace();