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

DO NOT DOWNLOAD, STABLE RELEASE AVAILABLE ON THE RELEASES TAB

Browse Source 
Fixes macro container Canvas issues

[TFS Changeset #59263]
This commit is contained in:
starfighter83
2009-09-18 19:14:25 +00:00
parent e34956d12f
commit 0cbd1a1d11
1 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,10 +12,12 @@ using System.Text.RegularExpressions;
using ClientDependency.Core;
using System.Web;
using ClientDependency.Core.Controls;
using umbraco.presentation;
namespace umbraco.editorControls.macrocontainer
{
[ClientDependency(100, ClientDependencyType.Javascript, "js/sortable/jquery-ui-1.7.2.custom.min.js", "UmbracoRoot")]
public class Editor : UpdatePanel, IDataEditor
{
private IData _data;
@@ -43,7 +45,12 @@ namespace umbraco.editorControls.macrocontainer
base.Page.ClientScript.RegisterClientScriptBlock(Page.GetType(), "subModal", "<script type=\"text/javascript\" src=\"" + GlobalSettings.Path + "/js/submodal/common.js\"></script><script type=\"text/javascript\" src=\"" + GlobalSettings.Path + "/js/submodal/subModal.js\"></script><link href=\"" + GlobalSettings.Path + "/js/submodal/subModal.css\" type=\"text/css\" rel=\"stylesheet\"></link>");
ajaxHelpers.EnsureLegacyCalls(base.Page);
if (!UmbracoContext.Current.LiveEditingContext.Enabled)
presentation.webservices.ajaxHelpers.EnsureLegacyCalls(base.Page);
else
ClientDependencyLoader.Instance.RegisterDependency("webservices/legacyAjaxCalls.asmx/js", "UmbracoRoot", ClientDependencyType.Javascript);
@@ -160,16 +167,22 @@ namespace umbraco.editorControls.macrocontainer
base.OnLoad(e);
// And a reference to the macro container calls
ScriptManager sm = ScriptManager.GetCurrent(base.Page);
ServiceReference webservicePath = new ServiceReference(GlobalSettings.Path + "/webservices/MacroContainerService.asmx");
if (!UmbracoContext.Current.LiveEditingContext.Enabled)
{
ScriptManager sm = ScriptManager.GetCurrent(base.Page);
ServiceReference webservicePath = new ServiceReference(GlobalSettings.Path + "/webservices/MacroContainerService.asmx");
if (!sm.Services.Contains(webservicePath))
sm.Services.Add(webservicePath);
if (!sm.Services.Contains(webservicePath))
sm.Services.Add(webservicePath);
}
else
{
ClientDependencyLoader.Instance.RegisterDependency("webservices/MacroContainerService.asmx/js", "UmbracoRoot", ClientDependencyType.Javascript);
}
ClientDependencyLoader.Instance.RegisterDependency("js/sortable/jquery-ui-1.7.2.custom.min.js",
"UmbracoRoot", ClientDependencyType.Javascript);
//ClientDependencyLoader.Instance.RegisterDependency("js/sortable/jquery-ui-1.7.2.custom.min.js",
// "UmbracoRoot", ClientDependencyType.Javascript);