magicajax-cvs

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

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

Modified Files:
	CallBackObject.js 
Log Message:
Added support for ASP.NET 2.0 Portal Framework

Index: CallBackObject.js
===================================================================
RCS file: /cvsroot/magicajax/magicajax/Core/script/CallBackObject.js,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CallBackObject.js	11 Nov 2005 06:17:49 -0000	1.1
--- CallBackObject.js	11 Nov 2005 22:29:39 -0000	1.2
***************
*** 159,174 ****
  	
  	// Checks the unique id and its parents until it finds a target element
! 	// i.e. for ajaxPanel_grid:_ctl1:_ctl0 it checks
! 	// ajaxPanel_grid:_ctl1:_ctl0
! 	// ajaxPanel_grid:_ctl1
! 	// ajaxPanel_grid
! 	// ajaxPanel
  	for (var num=ids.length; num > 0; num--)
  	{
  		var elemID = "";
  		for (var i=0; i < num; i++)
! 			elemID += "_" + ids[i];
  		
- 		elemID = elemID.substring(1, elemID.length);
  		target = document.getElementById(elemID);
  		if (target != null)
--- 159,172 ----
  	
  	// Checks the unique id and its parents until it finds a target element
! 	// i.e. for ajaxPanel_grid:row:field it checks
! 	//   ajaxPanel_grid_row_field
! 	//   ajaxPanel_grid_row
! 	//   ajaxPanel_grid
  	for (var num=ids.length; num > 0; num--)
  	{
  		var elemID = "";
  		for (var i=0; i < num; i++)
! 			elemID += (i==0 ? "" : "_") + ids[i];
  		
  		target = document.getElementById(elemID);
  		if (target != null)
***************
*** 177,181 ****
  	
  	var cbType = AJAXCbo.GetCallBackType(target);
- 	
  	if (cbType != "none")
  	{
--- 175,178 ----
***************
*** 258,266 ****
  				for (var j=0; j < theform.elements[i].options.length; j++)
  					if (theform.elements[i].options[j].selected)
! 						theData = theData + escape(eName.split("$").join(":")) + '=' + encodeURIComponent(theform.elements[i].options[j].value) + '&';
  			}
  			else if ( (type != "checkbox" && type != "radio") || theform.elements[i].checked )
  			{
! 				theData = theData + escape(eName.split("$").join(":")) + '=' + val;
  				if( i != theform.elements.length - 1 )
  					theData = theData + '&';
--- 255,263 ----
  				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 )
  			{
! 				theData = theData + escape(eName) + '=' + val;
  				if( i != theform.elements.length - 1 )
  					theData = theData + '&';