yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

re-enables LoadMinimalDocument and adds this to the optimized check, even in optimized model the OnRenderNode can still execute with a minimal doc.

Browse Source
This commit is contained in:
Shannon
2013-09-30 13:47:19 +10:00
committed by Sebastiaan Janssen
parent e5320f0abd
commit 35f65a2c64
7 changed files with 110 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

105
src/Umbraco.Tests/Trees/BaseContentTreeTests.cs
View File

@@ -7,67 +7,6 @@ using umbraco.cms.presentation.Trees;
namespace Umbraco.Tests.Trees
{
[TestFixture]
public class BaseMediaTreeTests
{
[TearDown]
public void TestTearDown()
{
BaseTree.AfterTreeRender -= EventHandler;
BaseTree.BeforeTreeRender -= EventHandler;
}
[Test]
public void Run_Optimized()
{
var tree = new MyOptimizedMediaTree("media");
Assert.IsTrue(tree.UseOptimizedRendering);
}
[Test]
public void Not_Optimized_Events_AfterRender()
{
var tree = new MyOptimizedMediaTree("media");
BaseTree.AfterTreeRender += EventHandler;
Assert.IsFalse(tree.UseOptimizedRendering);
}
[Test]
public void Not_Optimized_Events_BeforeRender()
{
var tree = new MyOptimizedMediaTree("media");
BaseTree.BeforeTreeRender += EventHandler;
Assert.IsFalse(tree.UseOptimizedRendering);
}
private void EventHandler(object sender, TreeEventArgs treeEventArgs)
{
}
public class MyOptimizedMediaTree : BaseMediaTree
{
public MyOptimizedMediaTree(string application)
: base(application)
{
}
protected override void CreateRootNode(ref XmlTreeNode rootNode)
{
}
}
}
[TestFixture]
public class BaseContentTreeTests
{
@@ -82,15 +21,17 @@ namespace Umbraco.Tests.Trees
[Test]
public void Run_Optimized()
{
var tree = new MyOptimizedContentTree("content");
var tree1 = new MyOptimizedContentTree1("content");
var tree2 = new MyOptimizedContentTree2("content");
Assert.IsTrue(tree.UseOptimizedRendering);
Assert.IsTrue(tree1.UseOptimizedRendering);
Assert.IsTrue(tree2.UseOptimizedRendering);
}
[Test]
public void Not_Optimized_Events_AfterRender()
{
var tree = new MyOptimizedContentTree("content");
var tree = new MyOptimizedContentTree1("content");
BaseTree.AfterTreeRender += EventHandler;
@@ -100,7 +41,7 @@ namespace Umbraco.Tests.Trees
[Test]
public void Not_Optimized_Events_BeforeRender()
{
var tree = new MyOptimizedContentTree("content");
var tree = new MyOptimizedContentTree1("content");
BaseTree.BeforeTreeRender += EventHandler;
@@ -120,17 +61,42 @@ namespace Umbraco.Tests.Trees
}
public class MyOptimizedContentTree : BaseContentTree
//optimized because we are not overriding OnRenderNode
public class MyOptimizedContentTree1 : BaseContentTree
{
public MyOptimizedContentTree(string application)
public MyOptimizedContentTree1(string application)
: base(application)
{
}
protected override void CreateRootNode(ref XmlTreeNode rootNode)
{
}
}
public class MyOptimizedContentTree2 : BaseContentTree
{
public MyOptimizedContentTree2(string application)
: base(application)
{
}
protected override bool LoadMinimalDocument
{
get { return true; }
}
protected override void CreateRootNode(ref XmlTreeNode rootNode)
{
}
//even if we override it will still be optimized because of the LoadMinimalDocument flag
protected override void OnRenderNode(ref XmlTreeNode xNode, umbraco.cms.businesslogic.web.Document doc)
{
base.OnRenderNode(ref xNode, doc);
}
}
public class MyNotOptimizedContentTree : BaseContentTree
@@ -145,6 +111,11 @@ namespace Umbraco.Tests.Trees
}
protected override bool LoadMinimalDocument
{
get { return false; }
}
protected override void OnRenderNode(ref XmlTreeNode xNode, umbraco.cms.businesslogic.web.Document doc)
{
base.OnRenderNode(ref xNode, doc);

65
src/Umbraco.Tests/Trees/BaseMediaTreeTests.cs Normal file
View File

@@ -0,0 +1,65 @@
using NUnit.Framework;
using umbraco.cms.presentation.Trees;
namespace Umbraco.Tests.Trees
{
[TestFixture]
public class BaseMediaTreeTests
{
[TearDown]
public void TestTearDown()
{
BaseTree.AfterTreeRender -= EventHandler;
BaseTree.BeforeTreeRender -= EventHandler;
}
[Test]
public void Run_Optimized()
{
var tree = new MyOptimizedMediaTree("media");
Assert.IsTrue(tree.UseOptimizedRendering);
}
[Test]
public void Not_Optimized_Events_AfterRender()
{
var tree = new MyOptimizedMediaTree("media");
BaseTree.AfterTreeRender += EventHandler;
Assert.IsFalse(tree.UseOptimizedRendering);
}
[Test]
public void Not_Optimized_Events_BeforeRender()
{
var tree = new MyOptimizedMediaTree("media");
BaseTree.BeforeTreeRender += EventHandler;
Assert.IsFalse(tree.UseOptimizedRendering);
}
private void EventHandler(object sender, TreeEventArgs treeEventArgs)
{
}
public class MyOptimizedMediaTree : BaseMediaTree
{
public MyOptimizedMediaTree(string application)
: base(application)
{
}
protected override void CreateRootNode(ref XmlTreeNode rootNode)
{
}
}
}
}

1
src/Umbraco.Tests/Umbraco.Tests.csproj
View File

@@ -351,6 +351,7 @@
<Compile Include="TestHelpers\Entities\MockedEntity.cs" />
<Compile Include="TestHelpers\Entities\MockedMedia.cs" />
<Compile Include="Trees\BaseContentTreeTests.cs" />
<Compile Include="Trees\BaseMediaTreeTests.cs" />
<Compile Include="UmbracoExamine\ContentServiceTest.cs" />
<Compile Include="UmbracoExamine\EventsTest.cs" />
<Compile Include="TypeHelperTests.cs" />

8
src/Umbraco.Web/umbraco.presentation/umbraco/Trees/BaseContentTree.cs
View File

@@ -27,7 +27,6 @@ namespace umbraco.cms.presentation.Trees
private User _user;
[Obsolete("This is no longer used and has no effect")]
protected virtual bool LoadMinimalDocument { get; set; }
/// <summary>
@@ -118,6 +117,11 @@ function openContent(id) {
{
var node = CreateNode(e, allowedUserOptions);
//in optimized mode the LoadMinimalDocument will ALWAYS be true, if it is not true then we will
// be rendering in non-optimized mode and this code will not get executed so we don't need to worry
// about performance here.
OnRenderNode(ref node, new Document(e, LoadMinimalDocument));
OnBeforeNodeRender(ref Tree, ref node, EventArgs.Empty);
if (node != null)
{
@@ -495,7 +499,7 @@ function openContent(id) {
//now we need to check if the current tree type has OnRenderNode overridden with a custom implementation
//Strangely - this even works in med trust!
var method = this.GetType().GetMethod("OnRenderNode", BindingFlags.Instance | BindingFlags.NonPublic, null, new[] { typeof(XmlTreeNode).MakeByRefType(), typeof(Document) }, null);
if (TypeHelper.IsOverride(method))
if (TypeHelper.IsOverride(method) && LoadMinimalDocument == false)
{
return false;
}

1
src/Umbraco.Web/umbraco.presentation/umbraco/Trees/ContentRecycleBin.cs
View File

@@ -20,7 +20,6 @@ namespace umbraco.cms.presentation.Trees
public ContentRecycleBin(string application) : base(application) { }
[Obsolete("This is no longer used and has no effect")]
protected override bool LoadMinimalDocument
{
get

1
src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadContent.cs
View File

@@ -56,7 +56,6 @@ namespace umbraco
}
}
[Obsolete("This is no longer used and has no effect")]
protected override bool LoadMinimalDocument
{
get

1
src/umbraco.editorControls/MultiNodeTreePicker/FilteredContentTree.cs
View File

@@ -36,7 +36,6 @@ namespace umbraco.editorControls.MultiNodeTreePicker
/// </summary>
private int? m_DeterminedStartNodeId = null;
[Obsolete("This is no longer used and has no effect")]
protected override bool LoadMinimalDocument
{
get