diff --git a/foreign dlls/ClientDependency.Core.dll b/foreign dlls/ClientDependency.Core.dll index 72d42cc91e..025ef1adf2 100644 Binary files a/foreign dlls/ClientDependency.Core.dll and b/foreign dlls/ClientDependency.Core.dll differ diff --git a/umbraco.sln b/umbraco.sln index 59d00f9654..695bcf3ec3 100644 --- a/umbraco.sln +++ b/umbraco.sln @@ -111,7 +111,7 @@ Global GlobalSection(TeamFoundationVersionControl) = preSolution SccNumberOfProjects = 14 SccEnterpriseProvider = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C} - SccTeamFoundationServer = https://tfs01.codeplex.com/ + SccTeamFoundationServer = https://tfs.codeplex.com/tfs/tfs01 SccLocalPath0 = . SccProjectUniqueName1 = umbraco\\presentation\\umbraco.presentation.csproj SccProjectName1 = umbraco/presentation diff --git a/umbraco/presentation/umbraco/webservices/TreeClientService.asmx.cs b/umbraco/presentation/umbraco/webservices/TreeClientService.asmx.cs index ca43f2f693..354a9d5bab 100644 --- a/umbraco/presentation/umbraco/webservices/TreeClientService.asmx.cs +++ b/umbraco/presentation/umbraco/webservices/TreeClientService.asmx.cs @@ -33,19 +33,44 @@ namespace umbraco.presentation.webservices TreeControl treeCtl = new TreeControl() { - ShowContextMenu = showContextMenu, - IsDialog = isDialog, - DialogMode = dialogMode, - App = app, - TreeType = "", - NodeKey = "", - StartNodeID = -1, - FunctionToCall = null + ShowContextMenu = showContextMenu, + IsDialog = isDialog, + DialogMode = dialogMode, + App = app, + TreeType = string.IsNullOrEmpty(treeType) ? "" : treeType, //don't set the tree type unless explicitly set + NodeKey = string.IsNullOrEmpty(nodeKey) ? "" : nodeKey, + StartNodeID = -1, //TODO: set this based on parameters! + FunctionToCall = string.IsNullOrEmpty(functionToCall) ? "" : functionToCall }; Dictionary returnVal = new Dictionary(); - returnVal.Add("json", treeCtl.GetJSONInitNode()); - returnVal.Add("app", app); + + if (string.IsNullOrEmpty(treeType)) + { + //if there's not tree type specified, then render out the tree as per normal with the normal + //way of doing things + returnVal.Add("json", treeCtl.GetJSONInitNode()); + } + else + { + + //get the tree that we need to render + var tree = TreeDefinitionCollection.Instance.FindTree(treeType).CreateInstance(); + tree.ShowContextMenu = showContextMenu; + tree.IsDialog = isDialog; + tree.DialogMode = dialogMode; + tree.NodeKey = string.IsNullOrEmpty(nodeKey) ? "" : nodeKey; + tree.FunctionToCall = string.IsNullOrEmpty(functionToCall) ? "" : functionToCall; + //this would be nice to set, but no parameters :( + //tree.StartNodeID = + + //now render it's start node + XmlTree xTree = new XmlTree(); + xTree.Add(tree.RootNode); + returnVal.Add("json", xTree.ToString()); + } + + returnVal.Add("app", app); returnVal.Add("js", treeCtl.JSCurrApp); return returnVal; diff --git a/umbraco/presentation/web.config.SHANDEMVAIO.xslt b/umbraco/presentation/web.config.SHANDEMVAIO.xslt index 4e03f02778..bd6b0d2d95 100644 --- a/umbraco/presentation/web.config.SHANDEMVAIO.xslt +++ b/umbraco/presentation/web.config.SHANDEMVAIO.xslt @@ -8,7 +8,7 @@ - 4.1.0.RC + 4.5.1