diff --git a/components/umbraco.webservices/umbraco.webservices.csproj b/components/umbraco.webservices/umbraco.webservices.csproj index 8bf1cd5d96..5fcc28472a 100644 --- a/components/umbraco.webservices/umbraco.webservices.csproj +++ b/components/umbraco.webservices/umbraco.webservices.csproj @@ -37,6 +37,7 @@ + 3.5 diff --git a/umbraco/presentation/umbraco/LiveEditing/Modules/ItemEditing/ItemEditingInvoke.js b/umbraco/presentation/umbraco/LiveEditing/Modules/ItemEditing/ItemEditingInvoke.js new file mode 100644 index 0000000000..47c371631d --- /dev/null +++ b/umbraco/presentation/umbraco/LiveEditing/Modules/ItemEditing/ItemEditingInvoke.js @@ -0,0 +1,3 @@ +//this is simply used for live editing in order to invoke a method from a previously lazy loaded script; +//alert("ItemEditingInvoke: " + initializeGlobalItemEditing); +initializeGlobalItemEditing(); \ No newline at end of file diff --git a/umbraco/presentation/umbraco/controls/Tree/TreeControl.ascx b/umbraco/presentation/umbraco/controls/Tree/TreeControl.ascx index ec45eefdb8..997d42a409 100644 --- a/umbraco/presentation/umbraco/controls/Tree/TreeControl.ascx +++ b/umbraco/presentation/umbraco/controls/Tree/TreeControl.ascx @@ -42,7 +42,7 @@ jQuery(document).ready(function() { treeType: treeType, functionToCall : functionToCall, nodeKey : nodeKey, - umbClientFolderRoot: "<%#umbraco.GlobalSettings.ClientPath%>", + umbClientFolderRoot: "<%#umbraco.IO.IOHelper.ResolveUrl(umbraco.IO.SystemDirectories.Umbraco_client)%>", treeMode: "<%#Mode.ToString().ToLower()%>", dataUrl: "<%#umbraco.IO.IOHelper.ResolveUrl(umbraco.IO.SystemDirectories.Umbraco)%>/webservices/TreeDataService.ashx", serviceUrl: "<%#umbraco.IO.IOHelper.ResolveUrl(umbraco.IO.SystemDirectories.Umbraco)%>/webservices/TreeClientService.asmx/GetInitAppTreeData"}); diff --git a/umbraco/presentation/umbraco/controls/Tree/TreeControl.ascx.designer.cs b/umbraco/presentation/umbraco/controls/Tree/TreeControl.ascx.designer.cs index c27bd96968..d5d1f36d64 100644 --- a/umbraco/presentation/umbraco/controls/Tree/TreeControl.ascx.designer.cs +++ b/umbraco/presentation/umbraco/controls/Tree/TreeControl.ascx.designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:2.0.50727.4927 +// Runtime Version:2.0.50727.4200 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. diff --git a/umbraco/presentation/umbraco/js/UmbracoSpeechBubbleInit.js b/umbraco/presentation/umbraco/js/UmbracoSpeechBubbleInit.js new file mode 100644 index 0000000000..ac6bf11c85 --- /dev/null +++ b/umbraco/presentation/umbraco/js/UmbracoSpeechBubbleInit.js @@ -0,0 +1,3 @@ +//used by live editing to ensure the speech bubble is initialized after the main js file has been lazy loaded. +//alert("Speech Bubble init: " + InitUmbracoSpeechBubble); +InitUmbracoSpeechBubble(); \ No newline at end of file