Menu
▾
▴
[Magicajax-cvs] magicajax/Core AjaxCallHelper.cs,1.12,1.13 MagicAjaxContext.cs,1.7,1.8 PageFilter.cs,1.4,1.5 StoredPageInfo.cs,1.3,1.4 Util.cs,1.12,1.13
|
From: Argiris K. <be...@us...> - 2005-12-04 03:25:24
|
Update of /cvsroot/magicajax/magicajax/Core In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31248/Core Modified Files: AjaxCallHelper.cs MagicAjaxContext.cs PageFilter.cs StoredPageInfo.cs Util.cs Log Message: Merged the changes from STABLE to HEAD Index: PageFilter.cs =================================================================== RCS file: /cvsroot/magicajax/magicajax/Core/PageFilter.cs,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** PageFilter.cs 2 Dec 2005 08:25:10 -0000 1.4 --- PageFilter.cs 4 Dec 2005 03:25:15 -0000 1.5 *************** *** 1,2 **** --- 1,23 ---- + #region LGPL License + /* + MagicAjax.NET Framework + Copyright (C) 2005 MagicAjax Project Team + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + #endregion + using System; using System.IO; Index: StoredPageInfo.cs =================================================================== RCS file: /cvsroot/magicajax/magicajax/Core/StoredPageInfo.cs,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** StoredPageInfo.cs 23 Nov 2005 15:12:48 -0000 1.3 --- StoredPageInfo.cs 4 Dec 2005 03:25:15 -0000 1.4 *************** *** 1,2 **** --- 1,23 ---- + #region LGPL License + /* + MagicAjax.NET Framework + Copyright (C) 2005 MagicAjax Project Team + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + #endregion + using System; using System.Web.UI; Index: AjaxCallHelper.cs =================================================================== RCS file: /cvsroot/magicajax/magicajax/Core/AjaxCallHelper.cs,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** AjaxCallHelper.cs 30 Nov 2005 12:22:29 -0000 1.12 --- AjaxCallHelper.cs 4 Dec 2005 03:25:15 -0000 1.13 *************** *** 41,45 **** get { ! return (ArrayList)(HttpContext.Current.Items["_sbWritingLevels"]); } set --- 41,50 ---- get { ! ArrayList levels = HttpContext.Current.Items["_sbWritingLevels"] as ArrayList; ! if ( levels == null ) ! { ! throw new MagicAjaxException("Using the AjaxCallHelper write methods outside of an AjaxCall is not allowed."); ! } ! return levels; } set Index: Util.cs =================================================================== RCS file: /cvsroot/magicajax/magicajax/Core/Util.cs,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** Util.cs 2 Dec 2005 08:25:10 -0000 1.12 --- Util.cs 4 Dec 2005 03:25:15 -0000 1.13 *************** *** 1,2 **** --- 1,23 ---- + #region LGPL License + /* + MagicAjax.NET Framework + Copyright (C) 2005 MagicAjax Project Team + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + #endregion + using System; using System.Collections; Index: MagicAjaxContext.cs =================================================================== RCS file: /cvsroot/magicajax/magicajax/Core/MagicAjaxContext.cs,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** MagicAjaxContext.cs 30 Nov 2005 12:22:29 -0000 1.7 --- MagicAjaxContext.cs 4 Dec 2005 03:25:15 -0000 1.8 *************** *** 1,2 **** --- 1,23 ---- + #region LGPL License + /* + MagicAjax.NET Framework + Copyright (C) 2005 MagicAjax Project Team + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + #endregion + using System; using System.Text; *************** *** 180,184 **** HttpBrowserCapabilities caps = HttpContext.Current.Request.Browser; ! if (caps.Browser != null && caps.EcmaScriptVersion.Major >= 1 && caps.W3CDomVersion.Major >= 1) { switch (caps.Browser.ToLower()) --- 201,205 ---- HttpBrowserCapabilities caps = HttpContext.Current.Request.Browser; ! if (caps.Browser != null && caps.EcmaScriptVersion.Major >= 1) { switch (caps.Browser.ToLower()) *************** *** 193,196 **** --- 214,220 ---- _isBrowserSupported = caps.MajorVersion >= 1; break; + case "netscape": + _isBrowserSupported = caps.MajorVersion >= 5; + break; //TODO: add support for Opera, Netscape and Safari } |
