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

Fix landing page, fix cancel button

Browse source
This commit is contained in:
Pieter Vander Vennet 2020-07-29 21:48:41 +02:00
parent 033e97b873
commit e3309dce0c
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Logic/OsmConnection.ts
View file

@ -28,7 +28,7 @@ export class OsmConnection {
oauth_secret: 'wDBRTCem0vxD7txrg1y6p5r8nvmz8tAhET7zDASI', oauth_secret: 'wDBRTCem0vxD7txrg1y6p5r8nvmz8tAhET7zDASI',
oauth_token: oauth_token.data, oauth_token: oauth_token.data,
singlepage: true, singlepage: true,
landing: "./index.html", landing: window.location.href,
auto: true // show a login form if the user is not authenticated and auto: true // show a login form if the user is not authenticated and
// you try to do a call // you try to do a call

8
UI/SimpleAddUI.ts
View file

@ -35,7 +35,7 @@ export class SimpleAddUI extends UIElement {
= new UIEventSource<Preset>(undefined); = new UIEventSource<Preset>(undefined);
private confirmButton: UIElement = undefined; private confirmButton: UIElement = undefined;
private cancelButton: UIElement; private cancelButton: UIElement;
private goToInboxButton: UIElement = new SubtleButton("/assets/envelope.svg", private goToInboxButton: UIElement = new SubtleButton("./assets/envelope.svg",
Translations.t.general.goToInbox, {url:"https://www.openstreetmap.org/messages/inbox", newTab: false}); Translations.t.general.goToInbox, {url:"https://www.openstreetmap.org/messages/inbox", newTab: false});
constructor(zoomlevel: UIEventSource<{ zoom: number }>, constructor(zoomlevel: UIEventSource<{ zoom: number }>,
@ -89,7 +89,7 @@ export class SimpleAddUI extends UIElement {
} }
this.cancelButton = new SubtleButton( this.cancelButton = new SubtleButton(
"/assets/close.svg", "./assets/close.svg",
Translations.t.general.cancel Translations.t.general.cancel
).onClick(() => { ).onClick(() => {
self._confirmPreset.setData(undefined); self._confirmPreset.setData(undefined);
@ -112,6 +112,10 @@ export class SimpleAddUI extends UIElement {
if (this._confirmPreset.data !== undefined) { if (this._confirmPreset.data !== undefined) {
if(this._userDetails.data.dryRun){
this.CreatePoint(this._confirmPreset.data)();
return;
}
return new Combine([ return new Combine([
Translations.t.general.add.confirmIntro.Subs({title: this._confirmPreset.data.name}), Translations.t.general.add.confirmIntro.Subs({title: this._confirmPreset.data.name}),