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

Removed some obsolete code

Browse source
This commit is contained in:
Pieter Vander Vennet 2020-07-31 18:38:14 +02:00
parent 431c90d9de
commit 77ad4ef666
5 changed files with 17 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

16
UI/SimpleAddUI.ts
View file

@ -20,6 +20,8 @@ import {State} from "../State";
export class SimpleAddUI extends UIElement {
private _addButtons: UIElement[];
private _loginButton : UIElement;
private _confirmPreset: UIEventSource<{
description: string | UIElement,
name: string | UIElement,
@ -37,13 +39,16 @@ export class SimpleAddUI extends UIElement {
super(State.state.locationControl);
this.ListenTo(Locale.language);
this.ListenTo(State.state.osmConnection.userDetails);
this.ListenTo(State.state.layerUpdater.runningQuery);
this._addButtons = [];
this.ListenTo(this._confirmPreset);
this._loginButton = Translations.t.general.add.pleaseLogin.Clone().onClick(() => State.state.osmConnection.AttemptLogin());
this._addButtons = [];
this.clss = "add-ui"
const self = this;
for (const layer of State.state.filteredLayers.data) {
for (const preset of layer.layerDef.presets) {
@ -134,7 +139,7 @@ export class SimpleAddUI extends UIElement {
}
if (!userDetails.data.loggedIn) {
return new Combine([header, Translations.t.general.add.pleaseLogin]).Render()
return new Combine([header, this._loginButton]).Render()
}
if (userDetails.data.unreadMessages > 0) {
@ -177,8 +182,5 @@ export class SimpleAddUI extends UIElement {
return header.Render() + html;
}
InnerUpdate(htmlElement: HTMLElement) {
State.state.osmConnection.registerActivateOsmAUthenticationClass();
}
}

9
UI/UserBadge.ts
View file

@ -21,13 +21,14 @@ export class UserBadge extends UIElement {
private _homeButton: UIElement;
private _languagePicker: UIElement;
private _loginButton : UIElement;
constructor() {
super(State.state.osmConnection.userDetails);
this._userDetails = State.state.osmConnection.userDetails;
this._pendingChanges = new PendingChanges();
this._languagePicker = Utils.CreateLanguagePicker();
this._loginButton = Translations.t.general.loginWithOpenStreetMap.Clone().onClick(() => State.state.osmConnection.AttemptLogin());
this._logout = new FixedUiElement("<img src='assets/logout.svg' class='small-userbadge-icon' alt='logout'>")
.onClick(() => {
State.state.osmConnection.LogOut();
@ -63,7 +64,7 @@ export class UserBadge extends UIElement {
InnerRender(): string {
const user = this._userDetails.data;
if (!user.loggedIn) {
return "<div class='activate-osm-authentication'>" + Translations.t.general.loginWithOpenStreetMap.R()+ "</div>";
return this._loginButton.Render();
}
@ -123,9 +124,5 @@ export class UserBadge extends UIElement {
}
protected InnerUpdate(htmlElement: HTMLElement) {
State.state.osmConnection.registerActivateOsmAUthenticationClass();
}
}

5
UI/WelcomeMessage.ts
View file

@ -31,7 +31,7 @@ export class WelcomeMessage extends UIElement {
}
this.description = fromLayout((layout) => layout.welcomeMessage);
this.plzLogIn = fromLayout((layout) => layout.gettingStartedPlzLogin);
this.plzLogIn = fromLayout((layout) => layout.gettingStartedPlzLogin.onClick(()=> State.state.osmConnection.AttemptLogin()));
this.welcomeBack = fromLayout((layout) => layout.welcomeBackMessage);
this.tail = fromLayout((layout) => layout.welcomeTail);
}
@ -54,8 +54,5 @@ export class WelcomeMessage extends UIElement {
"</span>";
}
protected InnerUpdate(htmlElement: HTMLElement) {
this.osmConnection?.registerActivateOsmAUthenticationClass()
}
}