lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-02-09 09:16:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixing Model navigation in shape tracing

Browse Source 
--HG--
branch : 1.x
This commit is contained in:
Sebastien Ros
2011-04-06 16:14:13 -07:00
parent 81b28e9d26
commit 39a463ea22
5 changed files with 85 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/Orchard.Web/Modules/Orchard.DesignerTools/Services/ShapeTracingFactory.cs
View File

@@ -23,7 +23,7 @@ namespace Orchard.DesignerTools.Services {
private readonly IWebSiteFolder _webSiteFolder;
private readonly IAuthorizer _authorizer;
private int _shapeId;
private readonly Dictionary<int, XElement> _dumped = new Dictionary<int, XElement>(1000);
private readonly DumpMap _dumped = new DumpMap();
public ShapeTracingFactory(
WorkContext workContext,
@@ -96,17 +96,11 @@ namespace Orchard.DesignerTools.Services {
var descriptor = shapeTable.Descriptors[shapeMetadata.Type];
// dump the Shape's content
var local = new Dictionary<int, XElement>();
new ObjectDumper(6, local, _dumped).Dump(context.Shape, "Model");
context.Shape.Reference = RuntimeHelpers.GetHashCode(context.Shape);
var dump = new ObjectDumper(6).Dump(context.Shape, "Model");
var sb = new StringBuilder();
context.Shape.LocalReferences = new Dictionary<int, string>();
foreach (var key in local.Keys) {
sb.Clear();
ConvertToJSon(local[key], sb);
((Dictionary<int, string>) context.Shape.LocalReferences)[key] = sb.ToString();
}
ConvertToJSon(dump, sb);
shape.Dump = sb.ToString();
shape.Template = null;
shape.OriginalTemplate = descriptor.BindingSource;
@@ -158,7 +152,7 @@ namespace Orchard.DesignerTools.Services {
public void Displayed(ShapeDisplayedContext context) {
}
private static void ConvertToJSon(XElement x, StringBuilder sb) {
public static void ConvertToJSon(XElement x, StringBuilder sb) {
if(x == null) {
return;
}
@@ -177,21 +171,18 @@ namespace Orchard.DesignerTools.Services {
sb.AppendFormat("name: \"{0}\", ", FormatJsonValue(name));
sb.AppendFormat("value: \"{0}\"", FormatJsonValue(value));
var a = x.Element("a");
if (a != null) {
sb.AppendFormat(", children: shapeTracingMetadataHost.references[{0}]", a.Attribute("href").Value);
}
var ul = x.Element("ul");
if (ul != null) {
if (ul != null && ul.Descendants().Any()) {
sb.Append(", children: [");
foreach (var li in ul.Elements()) {
sb.Append("{ ");
ConvertToJSon(li, sb);
sb.Append(" },");
sb.Append(" }");
sb.Append(", ");
}
sb.Append("]");
}
break;
}
}