Update of /cvsroot/magicajax/magicajax/Core
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2430/Core
Modified Files:
MagicAjaxContext.cs MagicAjaxModule.cs PageFilter.cs
Log Message:
Tracing reuses the same trace window.
Replaced keeping/restoring the page's form html with the previous implementation of RBS_Control_Stores.
Some corrections to allow compilation for NET 1.1 and CustomControls.
Index: PageFilter.cs
===================================================================
RCS file: /cvsroot/magicajax/magicajax/Core/PageFilter.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PageFilter.cs 23 Nov 2005 15:12:48 -0000 1.1
--- PageFilter.cs 23 Nov 2005 19:34:23 -0000 1.2
***************
*** 1,5 ****
using System;
using System.IO;
- using System.Collections.Generic;
using System.Text;
using System.Text.RegularExpressions;
--- 1,4 ----
Index: MagicAjaxContext.cs
===================================================================
RCS file: /cvsroot/magicajax/magicajax/Core/MagicAjaxContext.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MagicAjaxContext.cs 23 Nov 2005 15:21:13 -0000 1.2
--- MagicAjaxContext.cs 23 Nov 2005 19:34:22 -0000 1.3
***************
*** 1,4 ****
using System;
- using System.Collections.Generic;
using System.Text;
using System.Web;
--- 1,3 ----
Index: MagicAjaxModule.cs
===================================================================
RCS file: /cvsroot/magicajax/magicajax/Core/MagicAjaxModule.cs,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** MagicAjaxModule.cs 23 Nov 2005 15:12:48 -0000 1.26
--- MagicAjaxModule.cs 23 Nov 2005 19:34:23 -0000 1.27
***************
*** 100,104 ****
alert(""Unable to find script library '{0}/{1}'. Copy the file to the required location, or change the 'ajaxCallScriptPath' setting at magicAjax section of web.config."");
else
! AJAXCbo.HookAjaxCall({2},{3},{4},{5});
</script>";
--- 100,104 ----
alert(""Unable to find script library '{0}/{1}'. Copy the file to the required location, or change the 'ajaxCallScriptPath' setting at magicAjax section of web.config."");
else
! AJAXCbo.HookAjaxCall({2},{3},{4});
</script>";
***************
*** 128,132 ****
bool pageIsStored = (MagicAjaxContext.Configuration.PageStore.Mode != PageStoreMode.NoStore);
- string pageStateCacheName;
if ( pageIsStored )
--- 128,131 ----
***************
*** 141,164 ****
page.RegisterHiddenField (PageKeyFieldName, key);
}
-
- // At storing modes we don't mess with the ViewState field, so use
- // a different name for the hidden field at each page request so that
- // it can be reset for Firefox's "Refresh".
- pageStateCacheName = "__PAGE_STATE_CACHE" + DateTime.Now.Ticks;
}
- else
- {
- // Firefox, when performing a refresh, loads the page but keeps any changed INPUT
- // field values. Thus, the html of __PAGE_STATE_CACHE is restored
- // as if the page was loaded because of the browser's "Back Button".
- // We cannot avoid this because Firefox also keeps any changes that occured
- // to ViewState, so we need the controls to keep their changes.
- pageStateCacheName = "__PAGE_STATE_CACHE";
- }
-
- page.RegisterHiddenField(pageStateCacheName, String.Empty);
bool unloadStoredPage = MagicAjaxContext.Configuration.PageStore.UnloadStoredPage;
! page.RegisterStartupScript("AJAXCALL_HOOK", String.Format(STARTUP_SCRIPT_FORMAT, location, "AjaxCallObject.js", pageIsStored.ToString().ToLower(), unloadStoredPage.ToString().ToLower(), AjaxCallHelper.EncodeString(pageStateCacheName), MagicAjaxContext.Configuration.Tracing.ToString().ToLower()));
}
}
--- 140,147 ----
page.RegisterHiddenField (PageKeyFieldName, key);
}
}
bool unloadStoredPage = MagicAjaxContext.Configuration.PageStore.UnloadStoredPage;
! page.RegisterStartupScript("AJAXCALL_HOOK", String.Format(STARTUP_SCRIPT_FORMAT, location, "AjaxCallObject.js", pageIsStored.ToString().ToLower(), unloadStoredPage.ToString().ToLower(), MagicAjaxContext.Configuration.Tracing.ToString().ToLower()));
}
}
|
