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

Fix tests

Browse source
This commit is contained in:
Pieter Vander Vennet 2023-01-06 04:06:05 +01:00
parent cfa8ff896e
commit 7f6611f9d5
2 changed files with 27 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Logic/Osm/OsmConnection.ts
View file

@ -122,7 +122,10 @@ export class OsmConnection {
this.updateAuthObject()
this.preferencesHandler = new OsmPreferences(this.auth, this)
this.preferencesHandler = new OsmPreferences(
this.auth,
<any /*This is needed to make the tests work*/>this
)
if (options.oauth_token?.data !== undefined) {
console.log(options.oauth_token.data)
@ -146,7 +149,13 @@ export class OsmConnection {
}
public CreateChangesetHandler(allElements: ElementStorage, changes: Changes) {
return new ChangesetHandler(this._dryRun, this, allElements, changes, this.auth)
return new ChangesetHandler(
this._dryRun,
<any>/*casting is needed to make the tests work*/ this,
allElements,
changes,
this.auth
)
}
public GetPreference(

17
UI/Base/ScrollableFullScreen.ts
View file

@ -24,6 +24,7 @@ export default class ScrollableFullScreen {
private hashToShow: string
private _fullscreencomponent: BaseUIElement
private _resetScrollSignal: UIEventSource<void> = new UIEventSource<void>(undefined)
private _setHash: boolean
constructor(
title: (options: { mode: string }) => BaseUIElement,
@ -32,12 +33,16 @@ export default class ScrollableFullScreen {
resetScrollSignal: UIEventSource<void>
}) => BaseUIElement,
hashToShow: string,
isShown: UIEventSource<boolean> = new UIEventSource<boolean>(false)
isShown: UIEventSource<boolean> = new UIEventSource<boolean>(false),
options?: {
setHash?: boolean
}
) {
this.hashToShow = hashToShow
this.isShown = isShown
this._setHash = options?.setHash ?? true
if (hashToShow === undefined || hashToShow === "") {
if ((hashToShow === undefined || hashToShow === "") && this._setHash) {
throw "HashToShow should be defined as it is vital for the 'back' key functionality"
}
@ -52,17 +57,18 @@ export default class ScrollableFullScreen {
)
const self = this
if (this._setHash) {
Hash.hash.addCallback((h) => {
if (h === undefined) {
isShown.setData(false)
}
})
}
isShown.addCallbackD((isShown) => {
if (isShown) {
// We first must set the hash, then activate the panel
// If the order is wrong, this will cause the panel to disactivate again
Hash.hash.setData(hashToShow)
ScrollableFullScreen._currentlyOpen = self
self.Activate()
} else {
@ -74,7 +80,6 @@ export default class ScrollableFullScreen {
}
})
if (isShown.data) {
Hash.hash.setData(hashToShow)
ScrollableFullScreen._currentlyOpen = self
this.Activate()
}
@ -111,10 +116,10 @@ export default class ScrollableFullScreen {
* @constructor
*/
public Activate(): void {
this.isShown.setData(true)
if (this.hashToShow && this.hashToShow !== "") {
if (this.hashToShow && this.hashToShow !== "" && this._setHash) {
Hash.hash.setData(this.hashToShow)
}
this.isShown.setData(true)
this._fullscreencomponent.AttachTo("fullscreen")
const fs = document.getElementById("fullscreen")
ScrollableFullScreen._currentlyOpen = this