From 0c9b239bd377c4d89774abff7ba9cbeb51134bbd Mon Sep 17 00:00:00 2001 From: "Peter@KASSA01.lan" Date: Sat, 14 Jul 2012 08:04:58 -0200 Subject: [PATCH 1/3] fixing #30477 and #29003 --- .../umbraco/Trees/BaseMediaTree.cs | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/umbraco.presentation/umbraco/Trees/BaseMediaTree.cs b/src/umbraco.presentation/umbraco/Trees/BaseMediaTree.cs index 928223af6e..f9a440f219 100644 --- a/src/umbraco.presentation/umbraco/Trees/BaseMediaTree.cs +++ b/src/umbraco.presentation/umbraco/Trees/BaseMediaTree.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Text; using umbraco.BasePages; @@ -87,8 +87,15 @@ function openMedia(id) { } else { - xNode.Action = null; - xNode.DimNode(); + if (dd.ContentType.Alias.ToLower() == "folder") + { + xNode.Action = "javascript:jQuery('.umbTree #" + dd.Id.ToString() + "').click();"; + } + else + { + xNode.Action = null; + xNode.Style.DimNode(); + } } } else From 0eefbdc6108c4be5afb50c9d631e8bf17f1d4828 Mon Sep 17 00:00:00 2001 From: leekelleher Date: Thu, 26 Jul 2012 12:12:38 -0100 Subject: [PATCH 2/3] uQuery: Random never takes last element (applied from uComponents changeset 018bd63444b6) --- .../umbraco.presentation/umbraco/uQuery/NodeExtensions.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/NodeExtensions.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/NodeExtensions.cs index 94e960a52e..5e6000dcc0 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/NodeExtensions.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/NodeExtensions.cs @@ -475,7 +475,7 @@ namespace umbraco public static Node GetRandom(this IList nodes) { var random = umbraco.library.GetRandom(); - return nodes[random.Next(0, (nodes.Count - 1))]; + return nodes[random.Next(0, nodes.Count)]; } /// From 466d871edecfe4ff500730aa0e322d35c437fba8 Mon Sep 17 00:00:00 2001 From: "shannon@ShandemVaio" Date: Thu, 26 Jul 2012 22:34:56 +0600 Subject: [PATCH 3/3] Fixes Umbraco.Web reference in editorControls project --- .../umbraco.editorControls.csproj | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/umbraco.editorControls/umbraco.editorControls.csproj b/src/umbraco.editorControls/umbraco.editorControls.csproj index 2ba0d8f22e..b4636781e3 100644 --- a/src/umbraco.editorControls/umbraco.editorControls.csproj +++ b/src/umbraco.editorControls/umbraco.editorControls.csproj @@ -102,6 +102,10 @@ AllRules.ruleset + + {651E1350-91B6-44B7-BD60-7207006D7003} + Umbraco.Web + False ..\..\lib\ClientDependency.Core.dll @@ -154,20 +158,12 @@ {511F6D8D-7717-440A-9A57-A507E9A8B27F} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - - {651E1350-91B6-44B7-BD60-7207006D7003} - umbraco.presentation - {52AB8F1F-FB76-4E8C-885F-0747B6CE71EC} umbraco.macroRenderings - - False - ..\umbraco.presentation\Bin\umbraco.dll -