yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes issue with macro container datatype and ie js error

Browse Source 
[TFS Changeset #70515]
This commit is contained in:
starfighter83
2010-06-21 14:01:47 +00:00
parent 4300d9b35c
commit dd569525d6
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
components/editorControls/macrocontainer/Editor.cs
View File

@@ -172,18 +172,18 @@ namespace umbraco.editorControls.macrocontainer
base.OnLoad(e);
// And a reference to the macro container calls
if (!UmbracoContext.Current.LiveEditingContext.Enabled)
{
ScriptManager sm = ScriptManager.GetCurrent(base.Page);
ServiceReference webservicePath = new ServiceReference(SystemDirectories.Webservices + "/MacroContainerService.asmx");
//if (!UmbracoContext.Current.LiveEditingContext.Enabled)
//{
// ScriptManager sm = ScriptManager.GetCurrent(base.Page);
// ServiceReference webservicePath = new ServiceReference(SystemDirectories.Webservices + "/MacroContainerService.asmx");
if (!sm.Services.Contains(webservicePath))
sm.Services.Add(webservicePath);
}
else
{
ClientDependencyLoader.Instance.RegisterDependency("webservices/MacroContainerService.asmx/js", "UmbracoRoot", ClientDependencyType.Javascript);
}
// if (!sm.Services.Contains(webservicePath))
// sm.Services.Add(webservicePath);
//}
//else
//{
// ClientDependencyLoader.Instance.RegisterDependency("webservices/MacroContainerService.asmx/js", "UmbracoRoot", ClientDependencyType.Javascript);
//}