Kraut.World/server
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'remotes/workadventure-main/develop' into gamestate-api-read

Browse source 
# Conflicts:
#	front/src/Api/IframeListener.ts
This commit is contained in:
jonny 2021-05-10 21:48:11 +02:00
commit 8cef4f6e90
17 changed files with 9120 additions and 362 deletions
Download patch file Download diff file Expand all files Collapse all files

6
front/src/Api/Events/IframeEvent.ts
View file

@ -26,8 +26,8 @@ export type IframeEventMap = {
goToPage: GoToPageEvent
openCoWebSite: OpenCoWebSiteEvent
closeCoWebSite: null
disablePlayerControl: null
restorePlayerControl: null
disablePlayerControls: null
restorePlayerControls: null
displayBubble: null
removeBubble: null
enableMoveEvents: undefined
@ -55,4 +55,4 @@ export interface IframeResponseEvent<T extends keyof IframeResponseEventMap> {
}
// eslint-disable-next-line @typescript-eslint/no-explicit-any
export const isIframeResponseEventWrapper = (event: { type?: string }): event is IframeResponseEvent<keyof IframeResponseEventMap> => typeof event.type === 'string';
export const isIframeResponseEventWrapper = (event: { type?: string }): event is IframeResponseEvent<keyof IframeResponseEventMap> => typeof event.type === 'string';

6
front/src/Api/IframeListener.ts
View file

@ -107,9 +107,11 @@ class IframeListener {
}
else if (payload.type === 'closeCoWebSite') {
scriptUtils.closeCoWebSite();
} else if (payload.type === 'disablePlayerControl') {
}
else if (payload.type === 'disablePlayerControls') {
this._disablePlayerControlStream.next();
} else if (payload.type === 'restorePlayerControl') {
}
else if (payload.type === 'restorePlayerControls') {
this._enablePlayerControlStream.next();
} else if (payload.type === 'displayBubble') {
this._displayBubbleStream.next();