From f5b883ce67117c06e5d498746038aacb7dfb126c Mon Sep 17 00:00:00 2001 From: Bob Zeleznik Date: Tue, 31 Mar 2020 19:27:29 -0400 Subject: fixed stacking view rendering of templates that treat regular docs like collections (eg slideView) --- src/new_fields/Doc.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/new_fields') diff --git a/src/new_fields/Doc.ts b/src/new_fields/Doc.ts index 7fb17c788..25b526168 100644 --- a/src/new_fields/Doc.ts +++ b/src/new_fields/Doc.ts @@ -521,8 +521,7 @@ export namespace Doc { console.log("No, no, no!"); return { layout: childDoc, data: childDoc }; } - const existingResolvedDataDoc = childDoc[DataSym] !== Doc.GetProto(childDoc)[DataSym] && childDoc[DataSym]; - const resolvedDataDoc = existingResolvedDataDoc || (Doc.AreProtosEqual(containerDataDoc, containerDoc) || !containerDataDoc || (!childDoc.isTemplateDoc && !childDoc.isTemplateForField && !childDoc.PARAMS) ? undefined : containerDataDoc); + const resolvedDataDoc = (Doc.AreProtosEqual(containerDataDoc, containerDoc) || (!childDoc.isTemplateDoc && !childDoc.isTemplateForField && !childDoc.PARAMS) ? undefined : containerDataDoc); return { layout: Doc.expandTemplateLayout(childDoc, resolvedDataDoc, "(" + StrCast(containerDoc.PARAMS) + ")"), data: resolvedDataDoc }; } -- cgit v1.2.3-70-g09d2