aboutsummaryrefslogtreecommitdiff
path: root/src/new_fields
diff options
context:
space:
mode:
Diffstat (limited to 'src/new_fields')
-rw-r--r--src/new_fields/Doc.ts4
-rw-r--r--src/new_fields/util.ts2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/new_fields/Doc.ts b/src/new_fields/Doc.ts
index e84ddc684..219877f74 100644
--- a/src/new_fields/Doc.ts
+++ b/src/new_fields/Doc.ts
@@ -487,7 +487,7 @@ export namespace Doc {
setTimeout(action(() => {
if (!targetDoc[expandedLayoutFieldKey]) {
const newLayoutDoc = Doc.MakeDelegate(templateLayoutDoc, undefined, "[" + templateLayoutDoc.title + "]");
- newLayoutDoc["@params"] = params;
+ newLayoutDoc["params"] = params;
newLayoutDoc.expandedTemplate = targetDoc;
// the template's parameters are stored in params which are derefenced to find
// the actual field key where the template data is stored. Currently this is only used in RichTextSchema's docView
@@ -512,7 +512,7 @@ export namespace Doc {
}
const existingResolvedDataDoc = childDoc[DataSym] !== Doc.GetProto(childDoc)[DataSym] && childDoc[DataSym];
const resolvedDataDoc = existingResolvedDataDoc || (Doc.AreProtosEqual(containerDataDoc, containerDoc) || !containerDataDoc || (!childDoc.isTemplateDoc && !childDoc.isTemplateForField) ? undefined : containerDataDoc);
- return { layout: Doc.expandTemplateLayout(childDoc, resolvedDataDoc, "(" + StrCast(containerDoc["@params"]) + ")"), data: resolvedDataDoc };
+ return { layout: Doc.expandTemplateLayout(childDoc, resolvedDataDoc, "(" + StrCast(containerDoc["params"]) + ")"), data: resolvedDataDoc };
}
export function Overwrite(doc: Doc, overwrite: Doc, copyProto: boolean = false): Doc {
diff --git a/src/new_fields/util.ts b/src/new_fields/util.ts
index 0b98be953..080123965 100644
--- a/src/new_fields/util.ts
+++ b/src/new_fields/util.ts
@@ -128,7 +128,7 @@ export function getter(target: any, in_prop: string | symbol | number, receiver:
}
if (target.__LAYOUT__) return target.__LAYOUT__[prop];
}
- if (typeof prop === "string" && prop.startsWith("@@")) {
+ if (typeof prop === "string" && prop.startsWith("@")) {
const expanded = target.__fields["expandedTemplate"];
if (expanded) return expanded.cache[target.__fields[prop.substring(1)]];
}