diff options
| author | bob <bcz@cs.brown.edu> | 2020-02-07 15:06:46 -0500 |
|---|---|---|
| committer | bob <bcz@cs.brown.edu> | 2020-02-07 15:06:46 -0500 |
| commit | d310058e80f0896e2724f8723d5b95e1077296c1 (patch) | |
| tree | 400bc2038464c8a57c8f09e0c57369a837e025df /src/new_fields/util.ts | |
| parent | ea5e85e30b83b40135c83025d4f1be1ed188b9b7 (diff) | |
fixed __LAYOUT__ and added action() to pivot-in action
Diffstat (limited to 'src/new_fields/util.ts')
| -rw-r--r-- | src/new_fields/util.ts | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/new_fields/util.ts b/src/new_fields/util.ts index 26c10525e..52bb7afcd 100644 --- a/src/new_fields/util.ts +++ b/src/new_fields/util.ts @@ -110,15 +110,16 @@ export function setter(target: any, in_prop: string | symbol | number, value: an console.log(prop + " is deprecated - switch to _" + prop); prop = "_" + prop; } - const self = target[Self]; - const layoutDoc = (self || target).__LAYOUT__; - if (layoutDoc) layoutDoc[prop] = value; + if (target.__LAYOUT__) { + target.__LAYOUT__[prop] = value; + return true; + } // const resolvedLayout = getFieldImpl(target, getFieldImpl(target, "layoutKey", receiver), receiver); // if (resolvedLayout instanceof Doc) { // let x = resolvedLayout[Id]; // let layout = (resolvedLayout.layout as string).split("'")[1]; // let expanded = getFieldImpl(target, layout + "-layout[" + x + "]", receiver); - // expanded && (expanded[prop] = value); + // //expanded && (expanded[prop] = value); // // resolvedLayout[prop] = value; // return true; // } @@ -134,15 +135,13 @@ export function getter(target: any, in_prop: string | symbol | number, receiver: console.log(prop + " is deprecated - switch to _" + prop); prop = "_" + prop; } - const self = target[Self]; - const layoutDoc = (self || target).__LAYOUT__; - if (layoutDoc) return layoutDoc[prop]; + if (target.__LAYOUT__) return target.__LAYOUT__[prop]; // const resolvedLayout = getFieldImpl(target, getFieldImpl(target, "layoutKey", receiver), receiver); // if (resolvedLayout instanceof Doc) { // let x = resolvedLayout[Id]; // let layout = (resolvedLayout.layout as string).split("'")[1]; // let expanded = getFieldImpl(target, layout + "-layout[" + x + "]", receiver); - // return (expanded || resolvedLayout)?.[prop]; + // return (expanded)?.[prop]; // //return resolvedLayout[prop]; // } } |