lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Updating ZoneHoldingBehavior to define placement in global zones too

Browse Source 
--HG--
branch : 1.x
This commit is contained in:
Sebastien Ros
2012-06-07 18:09:21 -07:00
parent f9228af869
commit 6d3bf98c8a
3 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Orchard.Web/Core/Shapes/CoreShapes.cs
View File

@@ -47,7 +47,7 @@ namespace Orchard.Core.Shapes {
// and has an automatic zone creating behavior
builder.Describe("Layout")
.Configure(descriptor => descriptor.Wrappers.Add("Document"))
.OnCreating(creating => creating.Behaviors.Add(new ZoneHoldingBehavior(() => creating.New.Zone())))
.OnCreating(creating => creating.Behaviors.Add(new ZoneHoldingBehavior(() => creating.New.Zone(), null)))
.OnCreated(created => {
var layout = created.Shape;

2
src/Orchard/ContentManagement/DefaultContentDisplay.cs
View File

@@ -99,7 +99,7 @@ namespace Orchard.ContentManagement {
}
private dynamic CreateItemShape(string actualShapeType) {
var zoneHoldingBehavior = new ZoneHoldingBehavior(() => _shapeFactory.Create("ContentZone", Arguments.Empty()));
var zoneHoldingBehavior = new ZoneHoldingBehavior((Func<dynamic>)(() => _shapeFactory.Create("ContentZone", Arguments.Empty())), _workContextAccessor.GetContext().Layout);
return _shapeFactory.Create(actualShapeType, Arguments.Empty(), new[] { zoneHoldingBehavior });
}

22
src/Orchard/UI/Zones/ZoneHoldingBehavior.cs
View File

@@ -19,9 +19,11 @@ namespace Orchard.UI.Zones {
/// </summary>
public class ZoneHoldingBehavior : ClayBehavior {
private readonly Func<dynamic> _zoneFactory;
private readonly dynamic _layoutShape;
public ZoneHoldingBehavior(Func<dynamic> zoneFactory) {
public ZoneHoldingBehavior(Func<dynamic> zoneFactory, dynamic layoutShape) {
_zoneFactory = zoneFactory;
_layoutShape = layoutShape;
}
public override object GetMember(Func<object> proceed, object self, string name) {
@@ -29,7 +31,7 @@ namespace Orchard.UI.Zones {
// provide a robot for zone manipulation on parent object
return ClayActivator.CreateInstance(new IClayBehavior[] {
new InterfaceProxyBehavior(),
new ZonesBehavior(_zoneFactory, self)
new ZonesBehavior(_zoneFactory, self, _layoutShape)
});
}
@@ -49,11 +51,13 @@ namespace Orchard.UI.Zones {
public class ZonesBehavior : ClayBehavior {
private readonly Func<dynamic> _zoneFactory;
private readonly object _parent;
private object _parent;
private readonly dynamic _layoutShape;
public ZonesBehavior(Func<dynamic> zoneFactory, object parent) {
public ZonesBehavior(Func<dynamic> zoneFactory, object parent, dynamic layoutShape) {
_zoneFactory = zoneFactory;
_parent = parent;
_layoutShape = layoutShape;
}
public override object GetMember(Func<object> proceed, object self, string name) {
@@ -69,7 +73,15 @@ namespace Orchard.UI.Zones {
}
public override object GetIndex(Func<object> proceed, object self, System.Collections.Generic.IEnumerable<object> keys) {
if (keys.Count() == 1) {
return GetMember(proceed, null, System.Convert.ToString(keys.Single()));
var key = System.Convert.ToString(keys.Single());
// the zone name is in reference of Layout, e.g. /AsideSecond
if(_layoutShape != null && key.StartsWith("/")) {
key = key.Substring(1);
_parent = _layoutShape;
}
return GetMember(proceed, null, key);
}
return proceed();
}