From: Argiris K. <be...@us...> - 2005-12-20 13:11:17
|
Update of /cvsroot/magicajax/magicajax/Core In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19720/Core Modified Files: AjaxCallHelper.cs PageFilter.cs Log Message: Removed the 'script' postfix from the javascript functions. Index: PageFilter.cs =================================================================== RCS file: /cvsroot/magicajax/magicajax/Core/PageFilter.cs,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** PageFilter.cs 4 Dec 2005 03:25:15 -0000 1.5 --- PageFilter.cs 20 Dec 2005 13:11:08 -0000 1.6 *************** *** 92,96 **** string elmID = matchDragElm.Groups["DragElmId"].Value; wpmScript.AppendLine(string.Format("if (document.getElementById('{0}') == null)", elmID)); ! wpmScript.AppendLine(string.Format(" AJAXCbo.AddElementScript('{0}','span','__DragHolder',{1},'null');", formID, AjaxCallHelper.EncodeString(matchDragElm.Value))); } --- 92,96 ---- string elmID = matchDragElm.Groups["DragElmId"].Value; wpmScript.AppendLine(string.Format("if (document.getElementById('{0}') == null)", elmID)); ! wpmScript.AppendLine(string.Format(" AJAXCbo.AddElement('{0}','span','__DragHolder',{1},'null');", formID, AjaxCallHelper.EncodeString(matchDragElm.Value))); } Index: AjaxCallHelper.cs =================================================================== RCS file: /cvsroot/magicajax/magicajax/Core/AjaxCallHelper.cs,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** AjaxCallHelper.cs 5 Dec 2005 18:40:50 -0000 1.14 --- AjaxCallHelper.cs 20 Dec 2005 13:11:07 -0000 1.15 *************** *** 279,283 **** { string before = (beforeElemID != null) ? String.Format("\"{0}\"", beforeElemID) : "null"; ! Write( String.Format("AJAXCbo.AddElementScript(\"{0}\",\"{1}\",\"{2}\",{3},{4});\r\n", parentID, tagName, elementID, EncodeString(html), before) ); } --- 279,283 ---- { string before = (beforeElemID != null) ? String.Format("\"{0}\"", beforeElemID) : "null"; ! Write( String.Format("AJAXCbo.AddElement(\"{0}\",\"{1}\",\"{2}\",{3},{4});\r\n", parentID, tagName, elementID, EncodeString(html), before) ); } *************** *** 289,293 **** public static void WriteRemoveElementScript(string parentID, string elementID) { ! Write( String.Format("AJAXCbo.RemoveElementScript(\"{0}\",\"{1}\");\r\n", parentID, elementID) ); } --- 289,293 ---- public static void WriteRemoveElementScript(string parentID, string elementID) { ! Write( String.Format("AJAXCbo.RemoveElement(\"{0}\",\"{1}\");\r\n", parentID, elementID) ); } *************** *** 303,307 **** public static void WriteSetFieldScript(string fieldName, string fieldValue) { ! Write( String.Format("AJAXCbo.SetFieldScript(\"{0}\",{1});\r\n", fieldName, EncodeString(fieldValue)) ); } --- 303,307 ---- public static void WriteSetFieldScript(string fieldName, string fieldValue) { ! Write( String.Format("AJAXCbo.SetField(\"{0}\",{1});\r\n", fieldName, EncodeString(fieldValue)) ); } *************** *** 313,317 **** public static void WriteSetHtmlOfElementScript(string html, string elementID) { ! Write( String.Format("AJAXCbo.SetHtmlOfElementScript({0},\"{1}\");\r\n", EncodeString(html), elementID) ); } --- 313,317 ---- public static void WriteSetHtmlOfElementScript(string html, string elementID) { ! Write( String.Format("AJAXCbo.SetHtmlOfElement({0},\"{1}\");\r\n", EncodeString(html), elementID) ); } |