Update of /cvsroot/magicajax/MagicAjax NET 1.1/UI
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21307/UI
Modified Files:
AjaxControl.cs RenderedByScriptControl.cs
Log Message:
Many changes to get NoStore page mode working.
Set it as the default mode.
Index: AjaxControl.cs
===================================================================
RCS file: /cvsroot/magicajax/MagicAjax NET 1.1/UI/AjaxControl.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AjaxControl.cs 24 Oct 2005 23:42:38 -0000 1.1
--- AjaxControl.cs 10 Nov 2005 12:53:09 -0000 1.2
***************
*** 45,48 ****
--- 45,53 ----
}
+ public bool IsPageNoStoreMode
+ {
+ get { return (MagicAjaxModule.Instance.Configuration.PageStore.Mode == Configuration.PageStoreMode.NoStore); }
+ }
+
public AjaxControl()
{
Index: RenderedByScriptControl.cs
===================================================================
RCS file: /cvsroot/magicajax/MagicAjax NET 1.1/UI/RenderedByScriptControl.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RenderedByScriptControl.cs 24 Oct 2005 23:42:38 -0000 1.1
--- RenderedByScriptControl.cs 10 Nov 2005 12:53:09 -0000 1.2
***************
*** 70,74 ****
public abstract class RenderedByScriptControl : AjaxControl, IPreWriteScriptEventHandler, IScriptWriter
{
! public abstract void RenderByScript();
private bool _isRenderedOnPage = false;
--- 70,74 ----
public abstract class RenderedByScriptControl : AjaxControl, IPreWriteScriptEventHandler, IScriptWriter
{
! protected abstract void RenderByScript();
private bool _isRenderedOnPage = false;
***************
*** 81,93 ****
public event EventHandler PreWriteScript;
- // Disable EnableViewState so that the properties it sustains doesn't interfere with
- // the funtionality provided by RenderedByScriptControl.
- [Browsable(false),DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
- public override bool EnableViewState
- {
- get { return false; }
- set { }
- }
-
public override bool Visible
{
--- 81,84 ----
***************
*** 152,161 ****
public RenderedByScriptControl()
{
- base.EnableViewState = false;
this.ID = "";
}
public RenderedByScriptControl(HtmlTextWriterTag tag) : base(tag)
{
- base.EnableViewState = false;
this.ID = "";
}
--- 143,150 ----
***************
*** 206,210 ****
else if (control.Parent is RenderedByScriptControl)
return true;
! else
return IsChildOfRenderedByScriptControl(control.Parent);
}
--- 195,199 ----
else if (control.Parent is RenderedByScriptControl)
return true;
! else
return IsChildOfRenderedByScriptControl(control.Parent);
}
***************
*** 221,224 ****
--- 210,216 ----
protected override void Render(HtmlTextWriter writer)
{
+ if ( IsPageNoStoreMode )
+ _isRenderedOnPage = true;
+
RenderStartEventArgs eventArgs = new RenderStartEventArgs(writer);
OnRenderStart(eventArgs);
|
