noby
/
workadventure
2
2
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixed cherry pick conflicts

This commit is contained in:
jonny 2021-05-09 21:38:11 +02:00
parent 8da5bf9f8e
commit cf06f29ef8
2 changed files with 22 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
front/src/Api/Events/IframeEvent.ts
View File

@ -1,15 +1,10 @@
//import { GameStateEvent } from './ApiGameStateEvent';
//import { UpdateTileEvent } from './ApiUpdateTileEvent';
import { ButtonClickedEvent } from './ButtonClickedEvent';
import { ChatEvent } from './ChatEvent';
import { ClosePopupEvent } from './ClosePopupEvent';
import { EnterLeaveEvent } from './EnterLeaveEvent';
import { GoToPageEvent } from './GoToPageEvent';
import { LoadPageEvent } from './LoadPageEvent';
import { MenuItemClickedEvent } from './MenuItemClickedEvent';
import { MenuItemRegisterEvent } from './MenuItemRegisterEvent';
import { OpenCoWebSiteEvent } from './OpenCoWebSiteEvent';
import { OpenPopupEvent } from './OpenPopupEvent';
import { OpenTabEvent } from './OpenTabEvent';
@ -30,8 +25,6 @@ export type IframeEventMap = {
restorePlayerControl: null
displayBubble: null
removeBubble: null
registerMenuCommand: MenuItemRegisterEvent
loadPage: LoadPageEvent
}
export interface IframeEvent<T extends keyof IframeEventMap> {
type: T;
@ -43,7 +36,6 @@ export interface IframeEvent<T extends keyof IframeEventMap> {
export const isIframeEventWrapper = (event: any): event is IframeEvent<keyof IframeEventMap> => typeof event.type === 'string';
export interface IframeResponseEventMap {
menuItemClicked: MenuItemClickedEvent
userInputChat: UserInputChatEvent
enterEvent: EnterLeaveEvent
leaveEvent: EnterLeaveEvent

9
front/src/Api/IframeListener.ts
View File

@ -1,7 +1,5 @@
import { Subject } from "rxjs";
import { ChatEvent, isChatEvent } from "./Events/ChatEvent";
import {IframeEvent, isIframeEventWrapper} from "./Events/IframeEvent";
import {UserInputChatEvent} from "./Events/UserInputChatEvent";
import * as crypto from "crypto";
import { HtmlUtils } from "../WebRtc/HtmlUtils";
import { EnterLeaveEvent } from "./Events/EnterLeaveEvent";
@ -13,14 +11,7 @@ import {scriptUtils} from "./ScriptUtils";
import { GoToPageEvent, isGoToPageEvent } from "./Events/GoToPageEvent";
import { isOpenCoWebsite, OpenCoWebSiteEvent } from "./Events/OpenCoWebSiteEvent";
import { IframeEventMap, IframeEvent, IframeResponseEvent, IframeResponseEventMap, isIframeEventWrapper } from "./Events/IframeEvent";
import { isLoadPageEvent } from './Events/LoadPageEvent';
import { MenuItemClickedEvent } from './Events/MenuItemClickedEvent';
import { isMenuItemRegisterEvent } from './Events/MenuItemRegisterEvent';
import { isOpenCoWebsite, OpenCoWebSiteEvent } from "./Events/OpenCoWebSiteEvent";
import { isOpenPopupEvent, OpenPopupEvent } from "./Events/OpenPopupEvent";
import { isOpenTabEvent, OpenTabEvent } from "./Events/OpenTabEvent";
import { UserInputChatEvent } from "./Events/UserInputChatEvent";
import { scriptUtils } from "./ScriptUtils";
/**