Robin-van-der-Linde/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Fix runaway link, small issues

Browse source
This commit is contained in:
Pieter Vander Vennet 2022-03-10 23:59:18 +01:00
parent 7d02ed0af6
commit 65fc2c5de4
2 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
UI/BigComponents/ExtraLinkButton.ts
View file

@ -19,7 +19,7 @@ export default class ExtraLinkButton extends UIElement {
featureSwitchWelcomeMessage: UIEventSource<boolean>, locationControl: UIEventSource<Loc> featureSwitchWelcomeMessage: UIEventSource<boolean>, locationControl: UIEventSource<Loc>
}; };
constructor(state: { featureSwitchWelcomeMessage: UIEventSource<boolean>, locationControl: UIEventSource<Loc>, layoutToUse: { id: string, title: Translations } }, constructor(state: { featureSwitchWelcomeMessage: UIEventSource<boolean>, locationControl: UIEventSource<Loc>, layoutToUse: { id: string, title: Translation } },
config: ExtraLinkConfig) { config: ExtraLinkConfig) {
super(); super();
this.state = state; this.state = state;

11
UI/DefaultGUI.ts
View file

@ -25,7 +25,6 @@ import Combine from "./Base/Combine";
import AddNewMarker from "./BigComponents/AddNewMarker"; import AddNewMarker from "./BigComponents/AddNewMarker";
import FilteredLayer from "../Models/FilteredLayer"; import FilteredLayer from "../Models/FilteredLayer";
import ExtraLinkButton from "./BigComponents/ExtraLinkButton"; import ExtraLinkButton from "./BigComponents/ExtraLinkButton";
import {SubtleButton} from "./Base/SubtleButton";
/** /**
@ -164,19 +163,13 @@ export default class DefaultGUI {
() => new UserBadge(state) () => new UserBadge(state)
), ),
Toggle.If(state.featureSwitchExtraLinkEnabled, Toggle.If(state.featureSwitchExtraLinkEnabled,
() => { () => new ExtraLinkButton(state, state.layoutToUse.extraLink)
if (state.layoutToUse.extraLink.text === undefined) {
return Translations.t.general.screenToSmall
}
return new ExtraLinkButton(state, state.layoutToUse.extraLink);
}
) )
]).SetClass("flex flex-col") ]).SetClass("flex flex-col")
.AttachTo("userbadge") .AttachTo("userbadge")
const el = state.layoutToUse.extraLink
new Combine([ new Combine([
new ExtraLinkButton(state, {...state.layoutToUse.extraLink, newTab: true}) new ExtraLinkButton(state, {...state.layoutToUse.extraLink, newTab: true, requirements: new Set<"iframe" | "no-iframe" | "welcome-message" | "no-welcome-message">( ) })
]).SetClass("flex items-center justify-center normal-background h-full") ]).SetClass("flex items-center justify-center normal-background h-full")
.AttachTo("on-small-screen") .AttachTo("on-small-screen")