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 ----
|
