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

Remove merge conflict

Browse source
This commit is contained in:
Pieter Vander Vennet 2020-07-22 15:56:43 +02:00
parent 6c7e09b8c8
commit e4f9eca9dd
2 changed files with 1 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
UI/Base/Combine.ts
View file

@ -21,7 +21,7 @@ export default class Combine extends UIElement {
return elements; return elements;
} }
protected InnerUpdate(htmlElement: HTMLElement) { InnerUpdate(htmlElement: HTMLElement) {
for (const element of this.uiElements) { for (const element of this.uiElements) {
if (element instanceof UIElement) { if (element instanceof UIElement) {
element.Update(); element.Update();

7
index.ts
View file

@ -3,11 +3,7 @@ import {Changes} from "./Logic/Changes";
import {ElementStorage} from "./Logic/ElementStorage"; import {ElementStorage} from "./Logic/ElementStorage";
import {UIEventSource} from "./UI/UIEventSource"; import {UIEventSource} from "./UI/UIEventSource";
import {UserBadge} from "./UI/UserBadge"; import {UserBadge} from "./UI/UserBadge";
<<<<<<< HEAD
import {Basemap, BaseLayers} from "./Logic/Basemap"; import {Basemap, BaseLayers} from "./Logic/Basemap";
=======
import {BaseLayers, Basemap} from "./Logic/Basemap";
>>>>>>> 084a1d0c499c2d747ac5441aa8a6ce74f49ecf09
import {PendingChanges} from "./UI/PendingChanges"; import {PendingChanges} from "./UI/PendingChanges";
import {CenterMessageBox} from "./UI/CenterMessageBox"; import {CenterMessageBox} from "./UI/CenterMessageBox";
import {Helpers} from "./Helpers"; import {Helpers} from "./Helpers";
@ -331,7 +327,6 @@ const openFilterButton = `
new CheckBox(new Combine([new LayerSelection(flayers), openFilterButton]), closedFilterButton).AttachTo("filter__selection") new CheckBox(new Combine([new LayerSelection(flayers), openFilterButton]), closedFilterButton).AttachTo("filter__selection")
<<<<<<< HEAD
// --------------- Setting up basemap dropdown -------- // --------------- Setting up basemap dropdown --------
let baseLayerOptions = []; let baseLayerOptions = [];
@ -345,5 +340,3 @@ console.log(bm.CurrentLayer.data);
new DropDown(`label`, baseLayerOptions, bm.CurrentLayer).AttachTo("filter__selection"); new DropDown(`label`, baseLayerOptions, bm.CurrentLayer).AttachTo("filter__selection");
=======
>>>>>>> 084a1d0c499c2d747ac5441aa8a6ce74f49ecf09