From 7d7b37b2a63be5ebe4b25d68478b3a99ce905e1b Mon Sep 17 00:00:00 2001 From: pietervdvn Date: Wed, 21 Apr 2021 01:29:27 +0200 Subject: [PATCH 1/3] Generate docs now also generates the taginfo files --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 158f759cc2..99e98591f0 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "generate:images": "ts-node scripts/generateIncludedImages.ts", "generate:translations": "ts-node scripts/generateTranslations.ts", "generate:layouts": "ts-node scripts/generateLayouts.ts", - "generate:docs": "ts-node scripts/generateDocs.ts", + "generate:docs": "ts-node scripts/generateDocs.ts && ts-node scripts/generateTaginfoProjectFiles.ts", "generate:layeroverview": "ts-node scripts/generateLayerOverview.ts --no-fail", "generate:licenses": "ts-node scripts/generateLicenseInfo.ts --no-fail", "validate:layeroverview": "ts-node scripts/generateLayerOverview.ts --report", From 095c5d1f1b6526dc403b4ec378b8da00c0131e97 Mon Sep 17 00:00:00 2001 From: pietervdvn Date: Wed, 21 Apr 2021 01:55:15 +0200 Subject: [PATCH 2/3] Fix rotation selection on chrome, partial fix of #248 --- Models/Constants.ts | 2 +- UI/Input/DirectionInput.ts | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Models/Constants.ts b/Models/Constants.ts index 9091bfb51a..2119841636 100644 --- a/Models/Constants.ts +++ b/Models/Constants.ts @@ -2,7 +2,7 @@ import { Utils } from "../Utils"; export default class Constants { - public static vNumber = "0.6.8"; + public static vNumber = "0.6.8a"; // The user journey states thresholds when a new feature gets unlocked public static userJourney = { diff --git a/UI/Input/DirectionInput.ts b/UI/Input/DirectionInput.ts index 83b18a1235..008d75bcd8 100644 --- a/UI/Input/DirectionInput.ts +++ b/UI/Input/DirectionInput.ts @@ -23,7 +23,7 @@ export default class DirectionInput extends InputElement { return; } const cone = selfElement.getElementsByClassName("direction-svg")[0] as HTMLElement - cone.style.rotate = rotation + "deg"; + cone.style.transform = `rotate(${rotation}deg)`; }) @@ -38,7 +38,7 @@ export default class DirectionInput extends InputElement { return new Combine([ `
`, Svg.direction_svg().SetStyle( - `position: absolute;top: 0;left: 0;width: 100%;height: 100%;rotate:${this.value.data}deg;`) + `position: absolute;top: 0;left: 0;width: 100%;height: 100%;transform:rotate(${this.value.data ?? 0}deg);`) .SetClass("direction-svg"), Svg.compass_svg().SetStyle( "position: absolute;top: 0;left: 0;width: 100%;height: 100%;") @@ -74,7 +74,7 @@ export default class DirectionInput extends InputElement { htmlElement.onmousedown = (ev: MouseEvent) => { isDown = true; - onPosChange(ev.x, ev.y); + onPosChange(ev.clientX, ev.clientY); ev.preventDefault(); } @@ -84,7 +84,7 @@ export default class DirectionInput extends InputElement { htmlElement.onmousemove = (ev: MouseEvent) => { if (isDown) { - onPosChange(ev.x, ev.y); + onPosChange(ev.clientX, ev.clientY); } ev.preventDefault(); } } From f6519073d05d7269d16f2d63016e80bb81a2ccc0 Mon Sep 17 00:00:00 2001 From: pietervdvn Date: Wed, 21 Apr 2021 02:00:13 +0200 Subject: [PATCH 3/3] Small workaround if data is already parsed, fix #249 --- index.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/index.ts b/index.ts index d145cd1ae3..e5383347c7 100644 --- a/index.ts +++ b/index.ts @@ -84,13 +84,17 @@ if (layoutFromBase64.startsWith("http")) { success: (data) => { try { - const parsed = JSON.parse(data); + console.log("Received ", data) + let parsed = data; + if(typeof parsed == "string"){ + parsed = JSON.parse(data); + } // Overwrite the id to the wiki:value parsed.id = link; const layout = new LayoutConfig(parsed, false); InitUiElements.InitAll(layout, layoutFromBase64, testing, layoutFromBase64, btoa(data)); } catch (e) { - new FixedUiElement(`${link} is invalid:
${e}
Go back")`) + new FixedUiElement(`${link} is invalid:
${e}
Go back`) .SetClass("clickable") .AttachTo("centermessage"); console.error("Could not parse the text", data)