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

Add date validation, add url validation (and tracker cleaning), add date picker, close #44

Browse source
This commit is contained in:
Pieter Vander Vennet 2020-09-26 03:02:19 +02:00
parent 78368ef543
commit 415052af8a
8 changed files with 213 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

16
UI/TagRendering.ts
View file

@ -325,10 +325,7 @@ export class TagRendering extends UIElement implements TagDependantUIElement {
throw "Unkown type: "+type;
}
let isValid = ValidatedTextField.AllTypes[type].isValid;
if (isValid === undefined) {
isValid = () => true;
}
let formatter = ValidatedTextField.AllTypes[type].reformat ?? ((str) => str);
const pickString =
@ -336,17 +333,9 @@ export class TagRendering extends UIElement implements TagDependantUIElement {
if (string === "" || string === undefined) {
return undefined;
}
if (!isValid(string, this._source.data._country)) {
return undefined;
}
const tag = new Tag(freeform.key, formatter(string, this._source.data._country));
if (tag.value.length > 255) {
return undefined; // Too long
}
if (freeform.extraTags === undefined) {
return tag;
}
@ -374,7 +363,8 @@ export class TagRendering extends UIElement implements TagDependantUIElement {
return ValidatedTextField.Mapped(pickString, toString, {
placeholder: this._freeform.placeholder,
isValid: isValid,
type: type,
isValid: (str) => (str.length <= 255),
textArea: isTextArea
})
}