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

Merge branch 'develop'

Browse source 
# Conflicts:
#	assets/themes/climbing/climbing.json
#	assets/themes/mapcomplete-changes/mapcomplete-changes.json
#	css/index-tailwind-output.css
This commit is contained in:
Pieter Vander Vennet 2022-04-29 23:35:11 +02:00
commit ecba715265
90 changed files with 2564 additions and 2545 deletions
Download patch file Download diff file Expand all files Collapse all files

4
UI/Base/VariableUIElement.ts
View file

@ -16,7 +16,7 @@ export class VariableUiElement extends BaseUIElement {
}
AsMarkdown(): string {
const d = this._contents.data;
const d = this._contents?.data;
if (typeof d === "string") {
return d;
}
@ -29,7 +29,7 @@ export class VariableUiElement extends BaseUIElement {
protected InnerConstructElement(): HTMLElement {
const el = document.createElement("span");
const self = this;
this._contents.addCallbackAndRun((contents) => {
this._contents?.addCallbackAndRun((contents) => {
if (self.isDestroyed) {
return true;
}