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

Fix tests, fix units

Browse source
This commit is contained in:
Pieter Vander Vennet 2021-07-04 20:36:19 +02:00
parent 8b1b843dbe
commit fb3e3a040b
7 changed files with 52 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

18
UI/Input/ValidatedTextField.ts
View file

@ -287,13 +287,21 @@ export default class ValidatedTextField {
input = new CombinedInputElement(
input,
unitDropDown,
(text, denom) => denom?.canonicalValue(text, true) ?? undefined,
// combine the value from the textfield and the dropdown into the resulting value that should go into OSM
(text, denom) => denom?.canonicalValue(text, true) ?? undefined,
(valueWithDenom: string) => {
const [text, denom] = unit.findDenomination(valueWithDenom) ?? [valueWithDenom, undefined];
if(text === undefined){
return [valueWithDenom, undefined]
// Take the value from OSM and feed it into the textfield and the dropdown
const withDenom = unit.findDenomination(valueWithDenom);
if(withDenom === undefined)
{
// Not a valid value at all - we give it undefined and leave the details up to the other elements
return [undefined, undefined]
}
return [text, denom]
const [strippedText, denom] = withDenom
if(strippedText === undefined){
return [undefined, undefined]
}
return [strippedText, denom]
}
).SetClass("flex")
}

2
UI/Popup/SaveButton.ts
View file

@ -19,7 +19,7 @@ export class SaveButton extends Toggle {
const text = Translations.t.general.save
const saveEnabled = text.Clone().SetClass(`btn`);
const saveDisabled = text.SetClass(`btn btn-disabled`);
const saveDisabled = text.Clone().SetClass(`btn btn-disabled`);
const save = new Toggle(
saveEnabled,
saveDisabled,