From: Dion O. <dol...@us...> - 2006-02-08 08:29:20
|
Update of /cvsroot/magicajax/magicajax/Core In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1463/magicajax/Core Modified Files: AjaxCallHelper.cs MagicAjax NET 2.0.csproj Log Message: Changes for MEDIUM_TRUST compile tag Index: MagicAjax NET 2.0.csproj =================================================================== RCS file: /cvsroot/magicajax/magicajax/Core/MagicAjax NET 2.0.csproj,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** MagicAjax NET 2.0.csproj 7 Feb 2006 10:54:09 -0000 1.16 --- MagicAjax NET 2.0.csproj 8 Feb 2006 08:29:12 -0000 1.17 *************** *** 35,39 **** <ConfigurationOverrideFile> </ConfigurationOverrideFile> ! <DefineConstants>TRACE;DEBUG;NET_2_0; !MEDIUM_TRUST</DefineConstants> <DocumentationFile> </DocumentationFile> --- 35,39 ---- <ConfigurationOverrideFile> </ConfigurationOverrideFile> ! <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants> <DocumentationFile> </DocumentationFile> Index: AjaxCallHelper.cs =================================================================== RCS file: /cvsroot/magicajax/magicajax/Core/AjaxCallHelper.cs,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** AjaxCallHelper.cs 7 Feb 2006 10:54:08 -0000 1.28 --- AjaxCallHelper.cs 8 Feb 2006 08:29:12 -0000 1.29 *************** *** 832,842 **** private static IDictionary GetPageHiddenDictionary(Page page, string fieldName) { ! #if NET_2_0 && !MEDIUM_TRUST return (IDictionary)(Util.GetPrivateField(page.ClientScript, typeof(ClientScriptManager), fieldName)); ! #endif ! #if NET_2_0 && MEDIUM_TRUST ! return null; ! #endif ! #if !NET_2_0 return (IDictionary)(Util.GetPrivateField(page, typeof(Page), fieldName)); #endif --- 832,838 ---- private static IDictionary GetPageHiddenDictionary(Page page, string fieldName) { ! #if NET_2_0 return (IDictionary)(Util.GetPrivateField(page.ClientScript, typeof(ClientScriptManager), fieldName)); ! #else return (IDictionary)(Util.GetPrivateField(page, typeof(Page), fieldName)); #endif |