From: Argiris K. <be...@us...> - 2005-11-25 21:30:34
|
Update of /cvsroot/magicajax/magicajax/Core/UI In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15955/Core/UI Modified Files: RenderedByScriptControl.cs Log Message: RBS_Control_Store fields are registered on PreRender instead of Load event, to avoid some javascript errors when an AjaxPanel starts invisible. The error html reported by the server is put on page using document.write. Index: RenderedByScriptControl.cs =================================================================== RCS file: /cvsroot/magicajax/magicajax/Core/UI/RenderedByScriptControl.cs,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** RenderedByScriptControl.cs 23 Nov 2005 19:34:23 -0000 1.12 --- RenderedByScriptControl.cs 25 Nov 2005 21:30:26 -0000 1.13 *************** *** 182,189 **** } ! protected override void OnLoad(EventArgs e) { - base.OnLoad (e); - if (!IsChildOfRenderedByScriptControl(this)) { --- 182,187 ---- } ! protected override void OnPreRender(EventArgs e) { if (!IsChildOfRenderedByScriptControl(this)) { *************** *** 211,214 **** --- 209,214 ---- Page.RegisterArrayDeclaration("RBS_Controls_Store", String.Format("document.forms[0][\"{0}\"]", hiddenStore)); } + + base.OnPreRender (e); } |