Update of /cvsroot/magicajax/magicajax/CustomControls/script
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31248/CustomControls/script
Modified Files:
AjaxLinkedPanelListScripts.js
Log Message:
Merged the changes from STABLE to HEAD
Index: AjaxLinkedPanelListScripts.js
===================================================================
RCS file: /cvsroot/magicajax/magicajax/CustomControls/script/AjaxLinkedPanelListScripts.js,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** AjaxLinkedPanelListScripts.js 14 Nov 2005 18:50:43 -0000 1.2
--- AjaxLinkedPanelListScripts.js 4 Dec 2005 03:25:15 -0000 1.3
***************
*** 1,14 ****
! var prev_AJAXCbo_Complete = AJAXCbo.OnComplete;
! var prev_AJAXCbo_Error = AJAXCbo.OnError;
! AJAXCbo.OnComplete = AjaxLinkedPanelList_AJAXCbo_Complete;
! AJAXCbo.OnError = AjaxLinkedPanelList_AJAXCbo_Error;
- function AjaxLinkedPanelList_AJAXCbo_Complete(responseText, responseXML)
- {
- var result = prev_AJAXCbo_Complete(responseText, responseXML);
if (result == false)
return false;
!
RemoveLoadingImages();
--- 1,29 ----
! AjaxCallObject.prototype.OnComplete = function (responseText, responseXML)
! {
! if (__bTracing)
! {
! this.TraceReceivedData(responseText);
! }
! var result;
! // 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)
! {
! result = false;
! }
! else
! {
! eval(responseText);
!
! if (waitElement)
! waitElement.style.visibility = 'hidden';
!
! result = true;
! }
if (result == false)
return false;
!
RemoveLoadingImages();
***************
*** 32,41 ****
}
- function AjaxLinkedPanelList_AJAXCbo_Error(status, statusText, responseText)
- {
- RemoveLoadingImages();
- prev_AJAXCbo_Error(status, statusText, responseText);
- }
-
function AjaxLinkedPanelList_Link_Click(linkTarget)
{
--- 47,50 ----
|
