contrapunctus/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Change to groups and exposure of groups, add sticky header to first group item, fix shared questions

Browse source
This commit is contained in:
Pieter Vander Vennet 2021-10-23 00:31:41 +02:00
parent ff0ee35ec1
commit 688b991677
8 changed files with 101 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Models/ThemeConfig/WithContextLoader.ts
View file

@ -47,7 +47,7 @@ export default class WithContextLoader {
tagRenderings?: (string | { builtin: string, override: any } | TagRenderingConfigJson)[],
readOnly = false,
prepConfig: ((config: TagRenderingConfigJson) => TagRenderingConfigJson) = undefined
) {
) : TagRenderingConfig[]{
if (tagRenderings === undefined) {
return [];
}
@ -77,18 +77,17 @@ export default class WithContextLoader {
continue;
}
if (renderingJson["override"] !== undefined) {
let sharedJson = SharedTagRenderings.SharedTagRenderingJson.get(renderingId)
if (sharedJson === undefined) {
const keys = Array.from(SharedTagRenderings.SharedTagRenderingJson.keys());
throw `Predefined tagRendering ${renderingId} not found in ${context}.\n Try one of ${keys.join(
", "
)}\n If you intent to output this text literally, use {\"render\": <your text>} instead"}`;
}
renderingJson = Utils.Merge(renderingJson["override"], sharedJson)
let sharedJson = SharedTagRenderings.SharedTagRenderingJson.get(renderingId)
if (sharedJson === undefined) {
const keys = Array.from(SharedTagRenderings.SharedTagRenderingJson.keys());
throw `Predefined tagRendering ${renderingId} not found in ${context}.\n Try one of ${keys.join(
", "
)}\n If you intent to output this text literally, use {\"render\": <your text>} instead"}`;
}
if (renderingJson["override"] !== undefined) {
sharedJson = Utils.Merge(renderingJson["override"], sharedJson)
}
renderingJson = sharedJson
}