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

Linting themes, fix userbadges

Browse source
This commit is contained in:
Pieter Vander Vennet 2021-10-21 21:41:45 +02:00
parent 9336e19757
commit b9b8a5c71a
27 changed files with 4074 additions and 3903 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Models/ThemeConfig/TagRenderingConfig.ts
View file

@ -246,11 +246,6 @@ export default class TagRenderingConfig {
return false;
}
public IsQuestionBoxElement(): boolean {
return this.question === null && this.condition === null;
}
/**
* Gets all the render values. Will return multiple render values if 'multianswer' is enabled.
* The result will equal [GetRenderValue] if not 'multiAnswer'
@ -295,7 +290,7 @@ export default class TagRenderingConfig {
* Not compatible with multiAnswer - use GetRenderValueS instead in that case
* @constructor
*/
public GetRenderValue(tags: any): Translation {
public GetRenderValue(tags: any, defltValue: any = undefined): Translation {
if (this.mappings !== undefined && !this.multiAnswer) {
for (const mapping of this.mappings) {
if (mapping.if === undefined) {
@ -315,7 +310,7 @@ export default class TagRenderingConfig {
if (tags[this.freeform.key] !== undefined) {
return this.render;
}
return undefined;
return defltValue;
}
public ExtractImages(isIcon: boolean): Set<string> {