Update of /cvsroot/magicajax/magicajax/Core/UI
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9346/Core/UI
Modified Files:
AjaxControl.cs RenderedByScriptControl.cs
Log Message:
-Client event handling controls
-Various minor changes
Index: AjaxControl.cs
===================================================================
RCS file: /cvsroot/magicajax/magicajax/Core/UI/AjaxControl.cs,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** AjaxControl.cs 22 Dec 2005 01:15:20 -0000 1.11
--- AjaxControl.cs 3 Jan 2006 01:49:09 -0000 1.12
***************
*** 67,71 ****
public void RaisePreWriteScriptEvent()
{
- SetAjaxAttributes();
OnPreWriteScript (EventArgs.Empty);
}
--- 67,70 ----
***************
*** 125,129 ****
// Register 'AjaxCallObject.js' script
MagicAjaxModule.EnableAjaxOnPage(this.Page);
- SetAjaxAttributes();
#if NET_2_0
--- 124,127 ----
***************
*** 137,140 ****
--- 135,144 ----
}
+ protected override void AddAttributesToRender(HtmlTextWriter writer)
+ {
+ base.AddAttributesToRender (writer);
+ AddAjaxAttributesToRender (writer);
+ }
+
protected override void OnUnload(EventArgs e)
{
***************
*** 176,183 ****
/// <summary>
/// It is empty for the AjaxControl class. It is meant to be overriden
! /// by subclasses so that they set their MagicAjax attributes in their Attributes
! /// collection.
/// </summary>
! protected virtual void SetAjaxAttributes()
{
}
--- 180,186 ----
/// <summary>
/// It is empty for the AjaxControl class. It is meant to be overriden
! /// by subclasses so that they render their MagicAjax attributes.
/// </summary>
! protected virtual void AddAjaxAttributesToRender (HtmlTextWriter writer)
{
}
Index: RenderedByScriptControl.cs
===================================================================
RCS file: /cvsroot/magicajax/magicajax/Core/UI/RenderedByScriptControl.cs,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** RenderedByScriptControl.cs 22 Dec 2005 01:15:20 -0000 1.16
--- RenderedByScriptControl.cs 3 Jan 2006 01:49:09 -0000 1.17
***************
*** 69,73 ****
/// its tag attributes using javascript.
/// </remarks>
! public abstract class RenderedByScriptControl : AjaxControl, IScriptWriter
{
protected abstract void RenderByScript();
--- 69,73 ----
/// its tag attributes using javascript.
/// </remarks>
! public abstract class RenderedByScriptControl : AjaxControl, IScriptWriter, INonHtmlHolder
{
protected abstract void RenderByScript();
|
