Menu
▾
▴
magicajax-cvs — Receives CVS commit notifications
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(204) |
Dec
(147) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(52) |
Feb
(33) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
|
|
From: Argiris K. <be...@us...> - 2005-11-10 12:53:16
|
Update of /cvsroot/magicajax/MagicAjax NET 1.1/Configuration In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21307/Configuration Modified Files: MagicAjaxConfiguration.cs Log Message: Many changes to get NoStore page mode working. Set it as the default mode. Index: MagicAjaxConfiguration.cs =================================================================== RCS file: /cvsroot/magicajax/MagicAjax NET 1.1/Configuration/MagicAjaxConfiguration.cs,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MagicAjaxConfiguration.cs 3 Nov 2005 21:28:20 -0000 1.4 --- MagicAjaxConfiguration.cs 10 Nov 2005 12:53:09 -0000 1.5 *************** *** 71,75 **** // Default values _scriptPath = null; // Null implicates that the embedded javascripts will be used (default) ! PageStoreMode mode = PageStoreMode.Session; int cacheTimeout = 5; int maxPages = 5; --- 71,75 ---- // Default values _scriptPath = null; // Null implicates that the embedded javascripts will be used (default) ! PageStoreMode mode = PageStoreMode.NoStore; int cacheTimeout = 5; int maxPages = 5; |
|
From: Dion O. <dol...@us...> - 2005-11-09 21:06:13
|
Update of /cvsroot/magicajax/MagicAjax NET 1.1/Examples In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10852/MagicAjax NET 1.1/Examples Modified Files: Examples.aspx Log Message: replaced <cc1:AjaxButton by <asp:Button Index: Examples.aspx =================================================================== RCS file: /cvsroot/magicajax/MagicAjax NET 1.1/Examples/Examples.aspx,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Examples.aspx 9 Nov 2005 20:44:18 -0000 1.2 --- Examples.aspx 9 Nov 2005 21:06:05 -0000 1.3 *************** *** 15,19 **** <h5>1. Simple button showing server time</h5> <cc1:ajaxpanel ID="Ajaxpanel1" runat="server"> ! <cc1:AjaxButton runat="server" ID="ShowTime" Text="Show Server Date and Time" OnClick="ShowTime_Click" /> <asp:Label runat="server" ID="lblShowTime" /> </cc1:ajaxpanel> --- 15,19 ---- <h5>1. Simple button showing server time</h5> <cc1:ajaxpanel ID="Ajaxpanel1" runat="server"> ! <asp:Button runat="server" ID="ShowTime" Text="Show Server Date and Time" OnClick="ShowTime_Click" /> <asp:Label runat="server" ID="lblShowTime" /> </cc1:ajaxpanel> |
|
From: Dion O. <dol...@us...> - 2005-11-09 20:44:26
|
Update of /cvsroot/magicajax/MagicAjax NET 1.1/Examples In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5792/MagicAjax NET 1.1/Examples Modified Files: Examples.aspx Log Message: examples updated with a simple button showing server time in a label Index: Examples.aspx =================================================================== RCS file: /cvsroot/magicajax/MagicAjax NET 1.1/Examples/Examples.aspx,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Examples.aspx 3 Nov 2005 21:28:21 -0000 1.1 --- Examples.aspx 9 Nov 2005 20:44:18 -0000 1.2 *************** *** 12,18 **** <form id="form1" runat="server"> <hr> ! <h5>1. Master/detail dropdown lists</h5> ! <cc1:ajaxpanel runat="server"> Please pick a car: <asp:DropDownList id="brand" runat="server" AutoPostBack="true" OnSelectedIndexChanged="brand_SelectedIndexChanged"> --- 12,25 ---- <form id="form1" runat="server"> + <hr /> + <h5>1. Simple button showing server time</h5> + <cc1:ajaxpanel ID="Ajaxpanel1" runat="server"> + <cc1:AjaxButton runat="server" ID="ShowTime" Text="Show Server Date and Time" OnClick="ShowTime_Click" /> + <asp:Label runat="server" ID="lblShowTime" /> + </cc1:ajaxpanel> + <hr> ! <h5>2. Master/detail dropdown lists</h5> ! <cc1:ajaxpanel ID="Ajaxpanel2" runat="server"> Please pick a car: <asp:DropDownList id="brand" runat="server" AutoPostBack="true" OnSelectedIndexChanged="brand_SelectedIndexChanged"> *************** *** 25,30 **** <hr> ! <h5>2. Datagrid (sorting and selecting)</h5> ! <cc1:ajaxpanel runat="server"> <asp:DataGrid id="grid" Runat="server" BorderColor="#CC9966" BorderStyle="None" BorderWidth="1px" BackColor="White" CellPadding="4" AllowSorting="True" PageSize="3" --- 32,37 ---- <hr> ! <h5>3. Datagrid (sorting and selecting)</h5> ! <cc1:ajaxpanel ID="Ajaxpanel3" runat="server"> <asp:DataGrid id="grid" Runat="server" BorderColor="#CC9966" BorderStyle="None" BorderWidth="1px" BackColor="White" CellPadding="4" AllowSorting="True" PageSize="3" *************** *** 65,68 **** --- 72,84 ---- /******************/ + protected void ShowTime_Click(object sender, EventArgs e) + { + lblShowTime.Text = DateTime.Now.ToString(); + } + + /******************/ + /* Example 2 code */ + /******************/ + protected void brand_SelectedIndexChanged(object sender, EventArgs e) { *************** *** 108,112 **** /******************/ ! /* Example 2 code */ /******************/ --- 124,128 ---- /******************/ ! /* Example 3 code */ /******************/ |
|
From: Argiris K. <be...@us...> - 2005-11-08 07:53:41
|
Update of /cvsroot/magicajax/MagicAjax NET 1.1/script In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13417/script Modified Files: CallBackObject.js Log Message: Fixed a encoding bug. Now works properly if default document is missing from the url. Index: CallBackObject.js =================================================================== RCS file: /cvsroot/magicajax/MagicAjax NET 1.1/script/CallBackObject.js,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CallBackObject.js 7 Nov 2005 06:44:08 -0000 1.2 --- CallBackObject.js 8 Nov 2005 07:53:33 -0000 1.3 *************** *** 200,204 **** CallBackObject.prototype.OnPageUnload = function() { ! var thePage = window.location.pathname + "?__AJAX_PAGEUNLOAD=" + encodeURIComponent(document.all["__AJAX_PAGEKEY"].value); var oThis = AJAXCbo; --- 200,209 ---- CallBackObject.prototype.OnPageUnload = function() { ! var thePage = document.forms[0].action; ! var index = thePage.indexOf("?"); ! if (index != -1) ! thePage = thePage.substring(0, index); ! ! thePage = thePage + "?__AJAX_PAGEUNLOAD=" + encodeURIComponent(document.all["__AJAX_PAGEKEY"].value); var oThis = AJAXCbo; *************** *** 222,230 **** var theData = ''; var theform = document.forms[0]; ! var thePage = window.location.pathname + window.location.search; var eName = ''; theData = '__AJAX_EVENTTARGET=' + escape(eventTarget.split("$").join(":")) + '&'; ! theData += '__AJAX_EVENTARGUMENT=' + escape(eventArgument).split("+").join("%2B") + '&'; if ( ! __bPageIsStored ) --- 227,235 ---- var theData = ''; var theform = document.forms[0]; ! var thePage = theform.action; var eName = ''; theData = '__AJAX_EVENTTARGET=' + escape(eventTarget.split("$").join(":")) + '&'; ! theData += '__AJAX_EVENTARGUMENT=' + encodeURIComponent(eventArgument) + '&'; if ( ! __bPageIsStored ) *************** *** 255,259 **** } ! val = escape(val).split("+").join("%2B"); if ( type == "select-multiple" ) --- 260,264 ---- } ! val = encodeURIComponent(val); if ( type == "select-multiple" ) *************** *** 261,265 **** for (var j=0; j < theform.elements[i].options.length; j++) if (theform.elements[i].options[j].selected) ! theData = theData + escape(eName.split("$").join(":")) + '=' + escape(theform.elements[i].options[j].value).split("+").join("%2B") + '&'; } else if ( (type != "checkbox" && type != "radio") || theform.elements[i].checked ) --- 266,270 ---- for (var j=0; j < theform.elements[i].options.length; j++) if (theform.elements[i].options[j].selected) ! theData = theData + escape(eName.split("$").join(":")) + '=' + encodeURIComponent(theform.elements[i].options[j].value) + '&'; } else if ( (type != "checkbox" && type != "radio") || theform.elements[i].checked ) |
|
From: Argiris K. <be...@us...> - 2005-11-07 06:44:16
|
Update of /cvsroot/magicajax/MagicAjax NET 1.1 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7281 Modified Files: MagicAjaxModule.cs Web.config Log Message: Removed some debug code from MagicAjaxModule Fixed CallBackObject.js to properly replace postback for datagrids Index: Web.config =================================================================== RCS file: /cvsroot/magicajax/MagicAjax NET 1.1/Web.config,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Web.config 3 Nov 2005 21:28:21 -0000 1.3 --- Web.config 7 Nov 2005 06:44:08 -0000 1.4 *************** *** 10,13 **** --- 10,14 ---- [Optional] callBackScriptPath - Alternative path for "CallBackObject.js" If omitted, the embedded "CallBackObject.js" file is used (default). + example: <magicAjax callBackScriptPath="~/script" /> pageStore/mode - "NoStore" : Doesn't keep the page object, it is recreated for each callback "Session" : Saves the page object in session, works only for "InProc" SessionState Index: MagicAjaxModule.cs =================================================================== RCS file: /cvsroot/magicajax/MagicAjax NET 1.1/MagicAjaxModule.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MagicAjaxModule.cs 3 Nov 2005 21:28:21 -0000 1.2 --- MagicAjaxModule.cs 7 Nov 2005 06:44:08 -0000 1.3 *************** *** 376,382 **** string pageKey = _request.QueryString["__AJAX_PAGEUNLOAD"]; - //POUTSA - System.Diagnostics.Debug.Write(DateTime.Now + "---"); - System.Diagnostics.Debug.WriteLine((pageKey==null) ? "null" : pageKey); if (pageKey != null) { --- 376,379 ---- |
|
From: Argiris K. <be...@us...> - 2005-11-07 06:44:16
|
Update of /cvsroot/magicajax/MagicAjax NET 1.1/script In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7281/script Modified Files: CallBackObject.js Log Message: Removed some debug code from MagicAjaxModule Fixed CallBackObject.js to properly replace postback for datagrids Index: CallBackObject.js =================================================================== RCS file: /cvsroot/magicajax/MagicAjax NET 1.1/script/CallBackObject.js,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CallBackObject.js 24 Oct 2005 23:42:38 -0000 1.1 --- CallBackObject.js 7 Nov 2005 06:44:08 -0000 1.2 *************** *** 160,167 **** } CallBackObject.prototype.DoPostBack = function(eventTarget, eventArgument) { ! var elemID = eventTarget.split("$").join(":").split(":").join("_"); ! var target = document.getElementById(elemID); var cbType = AJAXCbo.GetCallBackType(target); --- 160,188 ---- } + // Replaces normal __doPostBack CallBackObject.prototype.DoPostBack = function(eventTarget, eventArgument) { ! var target; ! var elemUniqueID = eventTarget.split("$").join(":"); ! var ids = elemUniqueID.split(":"); ! ! // Checks the unique id and its parents until it finds a target element ! // i.e. for ajaxPanel_grid:_ctl1:_ctl0 it checks ! // ajaxPanel_grid:_ctl1:_ctl0 ! // ajaxPanel_grid:_ctl1 ! // ajaxPanel_grid ! // ajaxPanel ! for (var num=ids.length; num > 0; num--) ! { ! var elemID = ""; ! for (var i=0; i < num; i++) ! elemID += "_" + ids[i]; ! ! elemID = elemID.substring(1, elemID.length); ! target = document.getElementById(elemID); ! if (target != null) ! break; ! } ! var cbType = AJAXCbo.GetCallBackType(target); |
|
From: Dion O. <dol...@us...> - 2005-11-03 21:28:37
|
Update of /cvsroot/magicajax/MagicAjax NET 1.1/Configuration In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26255/MagicAjax NET 1.1/Configuration Modified Files: MagicAjaxConfiguration.cs Log Message: - Made changes for using CallBackObject.js as embedded resource - added a MagicAjax example page (with master/detail dropdowns and a datagrid) Index: MagicAjaxConfiguration.cs =================================================================== RCS file: /cvsroot/magicajax/MagicAjax NET 1.1/Configuration/MagicAjaxConfiguration.cs,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** MagicAjaxConfiguration.cs 3 Nov 2005 11:41:44 -0000 1.3 --- MagicAjaxConfiguration.cs 3 Nov 2005 21:28:20 -0000 1.4 *************** *** 70,74 **** { // Default values ! _scriptPath = "~/script"; PageStoreMode mode = PageStoreMode.Session; int cacheTimeout = 5; --- 70,74 ---- { // Default values ! _scriptPath = null; // Null implicates that the embedded javascripts will be used (default) PageStoreMode mode = PageStoreMode.Session; int cacheTimeout = 5; *************** *** 80,84 **** XmlAttribute attrib = (XmlAttribute)xml.Attributes.GetNamedItem("callBackScriptPath"); if (attrib != null) ! _scriptPath = attrib.Value; XmlNode pageStore = xml["pageStore"]; --- 80,87 ---- XmlAttribute attrib = (XmlAttribute)xml.Attributes.GetNamedItem("callBackScriptPath"); if (attrib != null) ! { ! // Resolve relative scriptPath url's (starting with "~") ! _scriptPath = CallBackHelper.ResolveUrl(attrib.Value); ! } XmlNode pageStore = xml["pageStore"]; *************** *** 146,152 **** } - // Resolve relative scriptPath url's (starting with "~") - _scriptPath = CallBackHelper.ResolveUrl(_scriptPath); - _pageStore = new PageStore(mode, cacheTimeout, maxPages, maxPagesLimitAlert); } --- 149,152 ---- |
|
From: Dion O. <dol...@us...> - 2005-11-03 21:28:37
|
Update of /cvsroot/magicajax/MagicAjax NET 1.1/Examples In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26255/MagicAjax NET 1.1/Examples Added Files: Examples.aspx Log Message: - Made changes for using CallBackObject.js as embedded resource - added a MagicAjax example page (with master/detail dropdowns and a datagrid) --- NEW FILE: Examples.aspx --- <%@ Page language="c#" %> <%@ Register TagPrefix="cc1" Namespace="MagicAjax.UI.Controls" Assembly="MagicAjax" %> <html> <head> <title>ASP.NET MagicAjax examples</title> <style type="text/css"> body { font-size: small; font-family: verdana } </style> </head> <body> <h4>MagicAjax demo's</h4> <form id="form1" runat="server"> <hr> <h5>1. Master/detail dropdown lists</h5> <cc1:ajaxpanel runat="server"> Please pick a car: <asp:DropDownList id="brand" runat="server" AutoPostBack="true" OnSelectedIndexChanged="brand_SelectedIndexChanged"> <asp:ListItem>- Select car brand -</asp:ListItem> </asp:DropDownList> <asp:DropDownList id="model" runat="server" AutoPostBack="true" Visible="false" OnSelectedIndexChanged="model_SelectedIndexChanged" /><br /><br /> <asp:Button id="select" runat="server" Text="Select Car" Enabled="false" OnClick="select_Click" /> <asp:Label id="lblSelectedCar" runat="server" /> </cc1:ajaxpanel> <hr> <h5>2. Datagrid (sorting and selecting)</h5> <cc1:ajaxpanel runat="server"> <asp:DataGrid id="grid" Runat="server" BorderColor="#CC9966" BorderStyle="None" BorderWidth="1px" BackColor="White" CellPadding="4" AllowSorting="True" PageSize="3" OnSortCommand="grid_SortCommand" OnSelectedIndexChanged="grid_SelectedIndexChanged"> <FooterStyle ForeColor="#330099" BackColor="#FFFFCC"></FooterStyle> <SelectedItemStyle Font-Bold="True" ForeColor="#663399" BackColor="#FFCC66"></SelectedItemStyle> <ItemStyle ForeColor="#330099" BackColor="White"></ItemStyle> <HeaderStyle Font-Bold="True" ForeColor="#FFFFCC" BackColor="#990000"></HeaderStyle> <Columns> <asp:ButtonColumn Text="Select" CommandName="Select"></asp:ButtonColumn> </Columns> <PagerStyle HorizontalAlign="Center" ForeColor="#330099" BackColor="#FFFFCC"></PagerStyle> </asp:DataGrid> </cc1:ajaxpanel> </form> </body> </html> <script language="C#" runat="server"> private void Page_Load(object sender, EventArgs e) { if (!IsPostBack) { //fill the car brands (example 1) brand.Items.Add("VW"); brand.Items.Add("Mercedes"); brand.Items.Add("Citroen"); //fill datagrid (example 2) FillGrid(); } } /******************/ /* Example 1 code */ /******************/ protected void brand_SelectedIndexChanged(object sender, EventArgs e) { model.Items.Clear(); model.Items.Add(new ListItem("- Select car model -", "")); model.Visible = true; switch (brand.SelectedValue) { case "VW": model.Items.Add("Golf"); model.Items.Add("Passat"); model.Items.Add("Beetle"); model.Items.Add("Phaeton"); break; case "Mercedes": model.Items.Add("S Class"); model.Items.Add("E Class"); model.Items.Add("A Class"); model.Items.Add("M Class"); break; case "Citroen": model.Items.Add("C3 Pluriel"); model.Items.Add("C5 Break"); model.Items.Add("C8"); model.Items.Add("Berlingo"); break; default: model.Visible = false; break; } } protected void model_SelectedIndexChanged(object sender, EventArgs e) { select.Enabled = model.SelectedIndex != 0; } protected void select_Click(object sender, EventArgs e) { lblSelectedCar.Text = "You have picked the " + brand.SelectedValue + " " + model.SelectedValue; } /******************/ /* Example 2 code */ /******************/ /// <summary> /// Creates a DataTable and binds to grid /// </summary> private void FillGrid() { //create data System.Data.DataTable dt = new System.Data.DataTable("Person"); dt.Columns.Add("Brand"); dt.Columns.Add("Model"); dt.Rows.Add(new string[] {"BMW", "X3"}); dt.Rows.Add(new string[] {"Citroen", "Berlingo"}); dt.Rows.Add(new string[] {"Fiat", "Punto"}); dt.Rows.Add(new string[] {"Mercedes", "E Class"}); dt.Rows.Add(new string[] {"Opel", "Zafira"}); dt.Rows.Add(new string[] {"Peugeot", "206"}); dt.Rows.Add(new string[] {"Volvo", "V70"}); dt.Rows.Add(new string[] {"VW", "Golf"}); System.Data.DataView dv = dt.DefaultView; //sort data dv.Sort = SortExpression; //bind data grid.DataSource = dv; grid.DataBind(); } /// <summary> /// SortExpression of the grid (stored in ViewState!) /// </summary> private string SortExpression { get { if (ViewState["_grid_SortExpression"] != null) { return (string)ViewState["_grid_SortExpression"]; } else { return "Brand"; //default } } set { ViewState["_grid_SortExpression"] = value; } } private void grid_SortCommand(object source, DataGridSortCommandEventArgs e) { if (SortExpression != e.SortExpression) { grid.SelectedIndex = -1; } SortExpression = e.SortExpression; //refill datagrid FillGrid(); } private void grid_SelectedIndexChanged(object sender, EventArgs e) { //refill datagrid FillGrid(); } </script> |
|
From: Dion O. <dol...@us...> - 2005-11-03 21:28:31
|
Update of /cvsroot/magicajax/MagicAjax NET 1.1 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26255/MagicAjax NET 1.1 Modified Files: MagicAjax.csproj MagicAjaxModule.cs Web.config Log Message: - Made changes for using CallBackObject.js as embedded resource - added a MagicAjax example page (with master/detail dropdowns and a datagrid) Index: Web.config =================================================================== RCS file: /cvsroot/magicajax/MagicAjax NET 1.1/Web.config,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Web.config 2 Nov 2005 21:53:00 -0000 1.2 --- Web.config 3 Nov 2005 21:28:21 -0000 1.3 *************** *** 8,12 **** <!-- MagicAjax configuration : ! callBackScriptPath - the path for "CallBackObject.js", default is "~/script" pageStore/mode - "NoStore" : Doesn't keep the page object, it is recreated for each callback "Session" : Saves the page object in session, works only for "InProc" SessionState --- 8,13 ---- <!-- MagicAjax configuration : ! [Optional] callBackScriptPath - Alternative path for "CallBackObject.js" ! If omitted, the embedded "CallBackObject.js" file is used (default). pageStore/mode - "NoStore" : Doesn't keep the page object, it is recreated for each callback "Session" : Saves the page object in session, works only for "InProc" SessionState *************** *** 19,24 **** pageStore/maxPagesLimitAlert - if it's true, an alert box is displayed when the maxConcurrentPages limit is reached. Default is false --> ! <magicAjax ! callBackScriptPath="~/script"> <pageStore mode="Session" --- 20,24 ---- pageStore/maxPagesLimitAlert - if it's true, an alert box is displayed when the maxConcurrentPages limit is reached. Default is false --> ! <magicAjax> <pageStore mode="Session" Index: MagicAjax.csproj =================================================================== RCS file: /cvsroot/magicajax/MagicAjax NET 1.1/MagicAjax.csproj,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MagicAjax.csproj 24 Oct 2005 23:41:39 -0000 1.1 --- MagicAjax.csproj 3 Nov 2005 21:28:21 -0000 1.2 *************** *** 149,152 **** --- 149,156 ---- /> <File + RelPath = "Examples\Examples.aspx" + BuildAction = "Content" + /> + <File RelPath = "Interfaces\ICallBackEventHandler.cs" SubType = "Code" *************** *** 174,178 **** <File RelPath = "script\CallBackObject.js" ! BuildAction = "Content" /> <File --- 178,182 ---- <File RelPath = "script\CallBackObject.js" ! BuildAction = "EmbeddedResource" /> <File Index: MagicAjaxModule.cs =================================================================== RCS file: /cvsroot/magicajax/MagicAjax NET 1.1/MagicAjaxModule.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MagicAjaxModule.cs 24 Oct 2005 23:41:39 -0000 1.1 --- MagicAjaxModule.cs 3 Nov 2005 21:28:21 -0000 1.2 *************** *** 151,157 **** // Provides the location of the script file. string location = _config.ScriptPath; ! // Create client script block. ! string includeScript = String.Format("<script language=\"javascript\" src=\"{0}/{1}\"></script>", location, "CallBackObject.js"); page.RegisterClientScriptBlock( "CALLBACK_FOR_AJAX", includeScript ); --- 151,169 ---- // Provides the location of the script file. string location = _config.ScriptPath; + string includeScript; ! // If script location is null, use embedded CallBackObject.js file ! if (location == null) ! { ! using (System.IO.StreamReader reader = new System.IO.StreamReader(typeof(MagicAjaxModule).Assembly.GetManifestResourceStream("MagicAjax.script.CallBackObject.js"))) ! { ! includeScript = "<script language=\"javascript\" type=\"text/javascript\">\r\n<!--\r\n" + reader.ReadToEnd() + "\r\n//-->\r\n</script>"; ! } ! } ! else ! { ! // Point to external script source file ! includeScript = String.Format("<script language=\"javascript\" src=\"{0}/{1}\"></script>", location, "CallBackObject.js"); ! } page.RegisterClientScriptBlock( "CALLBACK_FOR_AJAX", includeScript ); |
|
From: Dion O. <dol...@us...> - 2005-11-03 21:23:13
|
Update of /cvsroot/magicajax/MagicAjax NET 1.1/Examples In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24931/Examples Log Message: Directory /cvsroot/magicajax/MagicAjax NET 1.1/Examples added to the repository |
|
From: Argiris K. <be...@us...> - 2005-11-03 11:41:55
|
Update of /cvsroot/magicajax/MagicAjax NET 1.1/Configuration In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18551/Configuration Modified Files: MagicAjaxConfiguration.cs Log Message: _scriptPath is resolved at the end, in case magicAjax configuration section is missing Index: MagicAjaxConfiguration.cs =================================================================== RCS file: /cvsroot/magicajax/MagicAjax NET 1.1/Configuration/MagicAjaxConfiguration.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MagicAjaxConfiguration.cs 2 Nov 2005 21:53:00 -0000 1.2 --- MagicAjaxConfiguration.cs 3 Nov 2005 11:41:44 -0000 1.3 *************** *** 81,87 **** if (attrib != null) _scriptPath = attrib.Value; - - // Resolve relative scriptPath url's (starting with "~") - _scriptPath = CallBackHelper.ResolveUrl(_scriptPath); XmlNode pageStore = xml["pageStore"]; --- 81,84 ---- *************** *** 149,152 **** --- 146,152 ---- } + // Resolve relative scriptPath url's (starting with "~") + _scriptPath = CallBackHelper.ResolveUrl(_scriptPath); + _pageStore = new PageStore(mode, cacheTimeout, maxPages, maxPagesLimitAlert); } |
|
From: Argiris K. <be...@us...> - 2005-11-03 11:38:58
|
Update of /cvsroot/magicajax/MagicAjax NET 1.1 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17746 Modified Files: CallBackHelper.cs Log Message: Redirect uses ResolveUrl now Index: CallBackHelper.cs =================================================================== RCS file: /cvsroot/magicajax/MagicAjax NET 1.1/CallBackHelper.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CallBackHelper.cs 2 Nov 2005 21:53:00 -0000 1.2 --- CallBackHelper.cs 3 Nov 2005 11:38:38 -0000 1.3 *************** *** 283,298 **** { Response.Clear(); ! ! url = url.Trim(); ! if (url[0] == '~') ! { ! string appPath = Request.ApplicationPath; ! if (appPath == "/") ! appPath = String.Empty; ! ! url = url.Remove(0, 1).Insert(0, appPath); ! } ! ! Write(String.Format("window.location.href=\"{0}\";\r\n", url)); End(); } --- 283,287 ---- { Response.Clear(); ! Write(String.Format("window.location.href=\"{0}\";\r\n", ResolveUrl(url))); End(); } |
