midgard/mapcomplete
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix bugs with the opening hours picker

Browse source
This commit is contained in:
Pieter Vander Vennet 2020-10-05 20:42:54 +02:00
parent 09b7bfb9ca
commit 4d139b45e6
4 changed files with 12 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
UI/Input/OpeningHours/OpeningHoursPickerTable.ts
View file

@ -202,9 +202,12 @@ export default class OpeningHoursPickerTable extends InputElement<OpeningHour> {
ev.preventDefault(); ev.preventDefault();
for (const k in ev.targetTouches) { for (const k in ev.targetTouches) {
const touch = ev.targetTouches[k]; const touch = ev.targetTouches[k];
if(touch.clientX === undefined || touch.clientY === undefined){
continue;
}
const elUnderTouch = document.elementFromPoint( const elUnderTouch = document.elementFromPoint(
touch.screenX, touch.clientX,
touch.screenY touch.clientY
); );
// @ts-ignore // @ts-ignore
const f = elUnderTouch.onmouseenter; const f = elUnderTouch.onmouseenter;
@ -217,18 +220,7 @@ export default class OpeningHoursPickerTable extends InputElement<OpeningHour> {
cell.ontouchend = (ev) => { cell.ontouchend = (ev) => {
ev.preventDefault(); ev.preventDefault();
for (const k in ev.targetTouches) { endSelection();
const touch = ev.targetTouches[k];
const elUnderTouch = document.elementFromPoint(
touch.pageX,
touch.pageY
);
// @ts-ignore
const f = elUnderTouch.onmouseup;
if (f) {
f();
}
}
} }
} }

4
UI/i18n/Translations.ts
View file

@ -103,10 +103,10 @@ export default class Translations {
}), }),
respectPrivacy: new T({ respectPrivacy: new T({
en: "Please respect privacy. Do not photograph people nor license plates", en: "Please respect privacy. Do not photograph people nor license plates.<br/>Respect copyright. Only upload images you made yourself. Do not upload Google Streetview Images - these will be removed.",
ca: "Respecta la privacitat. No fotografiïs gent o matrícules", ca: "Respecta la privacitat. No fotografiïs gent o matrícules",
es: "Respeta la privacidad. No fotografíes gente o matrículas", es: "Respeta la privacidad. No fotografíes gente o matrículas",
nl: "Respecteer privacy. Fotografeer geen mensen of nummerplaten", nl: "Respecteer privacy. Fotografeer geen mensen of nummerplaten.<br/>Repecteer auteursrechten. Voeg enkel foto's toe die je zelf maakte. Screenshots van andere services (zoals Google Streetview) worden verwijderd",
fr: "Merci de respecter la vie privée. Ne publiez pas les plaques d\'immatriculation", fr: "Merci de respecter la vie privée. Ne publiez pas les plaques d\'immatriculation",
gl: "Respecta a privacidade. Non fotografes xente ou matrículas", gl: "Respecta a privacidade. Non fotografes xente ou matrículas",
de: "Bitte respektieren Sie die Privatsphäre. Fotografieren Sie weder Personen noch Nummernschilder" de: "Bitte respektieren Sie die Privatsphäre. Fotografieren Sie weder Personen noch Nummernschilder"

2
assets/editor-layer-index.json
View file

File diff suppressed because one or more lines are too long

20
test.ts
View file

@ -1,23 +1,9 @@
//* //*
import {VariableUiElement} from "./UI/Base/VariableUIElement";
import OpeningHoursRange from "./UI/Input/OpeningHours/OpeningHoursRange";
import {UIEventSource} from "./Logic/UIEventSource";
import OpeningHoursPicker from "./UI/Input/OpeningHours/OpeningHoursPicker";
import {OpeningHour} from "./Logic/OpeningHours";
let oh = new OpeningHoursPicker(new UIEventSource<OpeningHour[]>([])); import opening_hours from "opening_hours";
oh.SetStyle("height:100vh;display:block;").AttachTo('maindiv');
oh.GetValue().addCallback(data => console.log(data))
new VariableUiElement(oh.GetValue().map(oh => {
if(oh === undefined){
return "<no value selected>";
}
return oh.weekdayStart + " " + oh.startHour + ":" + oh.startMinutes + " --> " +
oh.weekdayEnd + " " + oh.endHour + ":" + oh.endMinutes
})).AttachTo("extradiv");
const oh =new opening_hours("mo 09:00-17:00;Tu 09:00-17:00;We 09:00-17:00");
console.log(oh)
/*/ /*/