WORK IN PROGRESS, GET THE STABLE SOURCE FROM THE DOWNLOADS TAB

Fixed merge issue with css + tree and missing config reference in webservice proj.

[TFS Changeset #63882]

components/umbraco.webservices/umbraco.webservices.csproj

@@ -37,6 +37,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
+    <Reference Include="System.configuration" />
     <Reference Include="System.Core">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
     </Reference>

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();

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"});

umbraco/presentation/umbraco/controls/Tree/TreeControl.ascx.designer.cs

@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     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.

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();