Update of /cvsroot/magicajax/magicajax/Core
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25522/Core
Modified Files:
MagicAjax NET 2.0.csproj MagicAjax.csproj MagicAjaxModule.cs
Log Message:
-Added 'AjaxType' MagicAjax attribute for controls
-Added 'ExcludeFlags' MagicAjax attribute for controls
-Added AjaxZone control.
Index: MagicAjax NET 2.0.csproj
===================================================================
RCS file: /cvsroot/magicajax/magicajax/Core/MagicAjax NET 2.0.csproj,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** MagicAjax NET 2.0.csproj 12 Dec 2005 05:31:17 -0000 1.9
--- MagicAjax NET 2.0.csproj 18 Dec 2005 16:44:46 -0000 1.10
***************
*** 141,144 ****
--- 141,147 ----
<SubType>Code</SubType>
</Compile>
+ <Compile Include="UI\Controls\AjaxZone.cs">
+ <SubType>Code</SubType>
+ </Compile>
<Compile Include="UI\Controls\AjaxHtmlAnchor.cs">
<SubType>Code</SubType>
Index: MagicAjax.csproj
===================================================================
RCS file: /cvsroot/magicajax/magicajax/Core/MagicAjax.csproj,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** MagicAjax.csproj 12 Dec 2005 05:31:17 -0000 1.6
--- MagicAjax.csproj 18 Dec 2005 16:44:46 -0000 1.7
***************
*** 208,211 ****
--- 208,216 ----
/>
<File
+ RelPath = "UI\Controls\AjaxZone.cs"
+ SubType = "Code"
+ BuildAction = "Compile"
+ />
+ <File
RelPath = "UI\Design\AjaxPanelDesigner.cs"
SubType = "Code"
Index: MagicAjaxModule.cs
===================================================================
RCS file: /cvsroot/magicajax/magicajax/Core/MagicAjaxModule.cs,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** MagicAjaxModule.cs 12 Dec 2005 05:31:17 -0000 1.42
--- MagicAjaxModule.cs 18 Dec 2005 16:44:46 -0000 1.43
***************
*** 475,478 ****
--- 475,480 ----
if (_magicAjaxContext.IsAjaxCall)
{
+ bool viewStateIsExcluded = ( _request.Form["__VIEWSTATE"] == null );
+
//insert output filter
_filter = new PageFilter(_response.Filter);
***************
*** 483,486 ****
--- 485,495 ----
try
{
+ if ( viewStateIsExcluded )
+ {
+ // ViewState is excluded from the post data. Disable it on
+ // the page since its value will not be sent to client.
+ (HttpContext.Current.Handler as Page).EnableViewState = false;
+ }
+
HttpContext.Current.Handler.ProcessRequest(HttpContext.Current);
}
***************
*** 505,512 ****
_response.Flush();
! string vsValue = _filter.GetViewStateFieldValue();
! if (vsValue != null && _request.Form["__VIEWSTATE"] != vsValue)
{
! AjaxCallHelper.WriteSetFieldScript("__VIEWSTATE", vsValue);
}
--- 514,524 ----
_response.Flush();
! if ( ! viewStateIsExcluded )
{
! string vsValue = _filter.GetViewStateFieldValue();
! if (vsValue != null && _request.Form["__VIEWSTATE"] != vsValue)
! {
! AjaxCallHelper.WriteSetFieldScript("__VIEWSTATE", vsValue);
! }
}
|
