From 6193a7e1c6b59505f524afd9b723cbe4a9236fa9 Mon Sep 17 00:00:00 2001 From: Shandem Date: Thu, 19 Aug 2010 12:14:37 +0000 Subject: [PATCH] Fixes: 28455 Updates ClientDependency lib to support non-url paths (instead they're absolute). ClientDependency file mappings are now unique to both computer and web root folder which will work around people deploying this folder between environments (though this still shouldn't be done) [TFS Changeset #75852] --- foreign dlls/ClientDependency.Core.dll | Bin 78848 -> 79360 bytes umbraco.sln | 2 +- .../webservices/TreeClientService.asmx.cs | 45 ++++++++++++++---- .../presentation/web.config.SHANDEMVAIO.xslt | 2 +- 4 files changed, 37 insertions(+), 12 deletions(-) diff --git a/foreign dlls/ClientDependency.Core.dll b/foreign dlls/ClientDependency.Core.dll index 72d42cc91ea4dd37a0291216146a77efef8bddf9..025ef1adf21a659f8502b8a2152f96c67c6e5c15 100644 GIT binary patch delta 16352 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 delta 15919 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 D$XtFC 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