From 148e056f965f2744e9d1ffea410e85fc915f7340 Mon Sep 17 00:00:00 2001 From: pietervdvn Date: Wed, 26 Jan 2022 21:21:12 +0100 Subject: [PATCH] Fix tests --- Models/ThemeConfig/Conversion/PrepareTheme.ts | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/Models/ThemeConfig/Conversion/PrepareTheme.ts b/Models/ThemeConfig/Conversion/PrepareTheme.ts index 617c9de211..35e1152aa2 100644 --- a/Models/ThemeConfig/Conversion/PrepareTheme.ts +++ b/Models/ThemeConfig/Conversion/PrepareTheme.ts @@ -179,7 +179,7 @@ class AddImportLayers extends DesugaringStep { } -class AddMiniMap extends DesugaringStep { +export class AddMiniMap extends DesugaringStep { constructor() { super("Adds a default 'minimap'-element to the tagrenderings if none of the elements define such a minimap", ["tagRenderings"]); } @@ -188,14 +188,18 @@ class AddMiniMap extends DesugaringStep { * Returns true if this tag rendering has a minimap in some language. * Note: this minimap can be hidden by conditions */ - private static hasMinimap(renderingConfig: TagRenderingConfigJson): boolean { - const translations: Translation[] = Utils.NoNull([renderingConfig.render, ...(renderingConfig.mappings ?? []).map(m => m.then)]); - for (const translation of translations) { - for (const key in translation.translations) { - if (!translation.translations.hasOwnProperty(key)) { + static hasMinimap(renderingConfig: TagRenderingConfigJson): boolean { + const translations: any[] = Utils.NoNull([renderingConfig.render, ...(renderingConfig.mappings ?? []).map(m => m.then)]); + for (let translation of translations) { + if(typeof translation == "string"){ + translation = {"*": translation} + } + + for (const key in translation) { + if (!translation.hasOwnProperty(key)) { continue } - const template = translation.translations[key] + const template = translation[key] const parts = SubstitutedTranslation.ExtractSpecialComponents(template) const hasMiniMap = parts.filter(part => part.special !== undefined).some(special => special.special.func.funcName === "minimap") if (hasMiniMap) {