From: Argiris K. <be...@us...> - 2005-12-03 11:51:14
|
Update of /cvsroot/magicajax/magicajax/Core/script In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22338/Core/script Modified Files: Tag: STABLE AjaxCallObject.js Log Message: Some minor fixes that "may" solve IE errors like 'Out of memory'. Index: AjaxCallObject.js =================================================================== RCS file: /cvsroot/magicajax/magicajax/Core/script/AjaxCallObject.js,v retrieving revision 1.27.2.2 retrieving revision 1.27.2.3 diff -C2 -d -r1.27.2.2 -r1.27.2.3 *** AjaxCallObject.js 2 Dec 2005 13:12:41 -0000 1.27.2.2 --- AjaxCallObject.js 3 Dec 2005 11:50:58 -0000 1.27.2.3 *************** *** 1,4 **** --- 1,5 ---- __AJAXCboList = new Array(); __bPageIsStored = false; + __bUnloadStoredPage = false; __bTracing = false; __PreviousOnFormSubmit = null; *************** *** 74,77 **** --- 75,79 ---- __bPageIsStored = bPageIsStored; + __bUnloadStoredPage = bUnloadStoredPage; __bTracing = bTracing; *************** *** 89,105 **** __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; } *************** *** 181,185 **** if (__PreviousPostBack != null) { - AJAXCbo.ClearTracingWindows(); __PreviousPostBack(eventTarget, eventArgument); } --- 174,177 ---- *************** *** 197,201 **** 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 = ""; } *************** *** 213,217 **** { 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) *************** *** 222,225 **** --- 214,220 ---- { AJAXCbo.ClearTracingWindows(); + + if ( !__bPageIsStored || !__bUnloadStoredPage ) + return; if (document.forms[0]["__AJAX_PAGEKEY"] == null) |