From: Dion O. <dol...@us...> - 2005-11-23 15:12:57
|
Update of /cvsroot/magicajax/magicajax/Core/UI/Controls In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31357/magicajax/Core/UI/Controls Modified Files: AjaxPanel.cs Log Message: Major changes to enable MagicAjax for concurrent users. Added: MagicAjaxContext class (containing properties like 'IsAjaxCall') Added: PageFilter.cs (just moved the PageFilter class from MagicAjaxModule.cs) Index: AjaxPanel.cs =================================================================== RCS file: /cvsroot/magicajax/magicajax/Core/UI/Controls/AjaxPanel.cs,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** AjaxPanel.cs 22 Nov 2005 00:59:22 -0000 1.20 --- AjaxPanel.cs 23 Nov 2005 15:12:48 -0000 1.21 *************** *** 873,877 **** string[] namevalue = namevaluepair.Split('#'); ! if (MagicAjaxModule.Instance.Configuration.PageStore.CompareMode == MagicAjax.Configuration.OutputCompareMode.FullHtml) { controlHtmlFingerprints.Add(string.Format("{0}_{1}", panelClientID, namevalue[0]), UnicodeEncoding.Default.GetString(Convert.FromBase64String(namevalue[1]))); --- 873,877 ---- string[] namevalue = namevaluepair.Split('#'); ! if (MagicAjaxContext.Configuration.PageStore.CompareMode == MagicAjax.Configuration.OutputCompareMode.FullHtml) { controlHtmlFingerprints.Add(string.Format("{0}_{1}", panelClientID, namevalue[0]), UnicodeEncoding.Default.GetString(Convert.FromBase64String(namevalue[1]))); *************** *** 933,937 **** string keyWithoutNamingcontainer = key.Substring(panelClientID.Length + 1); ! if (MagicAjaxModule.Instance.Configuration.PageStore.CompareMode == MagicAjax.Configuration.OutputCompareMode.FullHtml) { sbuilder.AppendFormat("{0}#{1}", keyWithoutNamingcontainer, Convert.ToBase64String(UnicodeEncoding.Default.GetBytes((string)_controlHtmlFingerprints[key]))); --- 933,937 ---- string keyWithoutNamingcontainer = key.Substring(panelClientID.Length + 1); ! if (MagicAjaxContext.Configuration.PageStore.CompareMode == MagicAjax.Configuration.OutputCompareMode.FullHtml) { sbuilder.AppendFormat("{0}#{1}", keyWithoutNamingcontainer, Convert.ToBase64String(UnicodeEncoding.Default.GetBytes((string)_controlHtmlFingerprints[key]))); *************** *** 946,950 **** string panelKey = GetControlFingerprintsField(panelClientID); ! if ( AjaxCallHelper.IsAjaxCallForPage(_owner.Page) ) { //if ajax callback, generate javascript to set panelfingerprints's hidden field value --- 946,950 ---- string panelKey = GetControlFingerprintsField(panelClientID); ! if ( MagicAjaxContext.Current.IsAjaxCallForPage(_owner.Page) ) { //if ajax callback, generate javascript to set panelfingerprints's hidden field value |