[WIP] fixed cherry pick conflicts

This commit is contained in:
jonny 2021-05-28 00:34:40 +02:00
parent 2de2d114a1
commit cbe93d7164
5 changed files with 6762 additions and 58 deletions

View file

@ -1,4 +1,4 @@
import { ChatEvent } from '../Events/ChatEvent'
import type { ChatEvent } from '../Events/ChatEvent'
import { isUserInputChatEvent, UserInputChatEvent } from '../Events/UserInputChatEvent'
import { } from "./iframe-registration"
import { apiCallback, IframeApiContribution, sendToWorkadventure } from './IframeApiContribution'

View file

@ -1,5 +1,5 @@
import { IframeEvent, IframeEventMap, IframeResponseEventMap } from '../Events/IframeEvent';
import { registeredCallbacks, WorkAdventureApi } from "../../iframe_api"
import { registeredCallbacks } from "../../iframe_api";
import type { IframeResponseEventMap } from '../Events/IframeEvent';
/*export function registerWorkadventureCommand<T>(commnds: T): T {
const commandPrototype = Object.getPrototypeOf(commnds);
const commandClassPropertyNames = Object.getOwnPropertyNames(commandPrototype).filter(name => name !== "constructor");

View file

@ -1,7 +1,7 @@
import { isButtonClickedEvent } from '../Events/ButtonClickedEvent';
import { ClosePopupEvent } from '../Events/ClosePopupEvent';
import { apiCallback, IframeApiContribution, IframeCallbackContribution, sendToWorkadventure } from './IframeApiContribution';
import zoneCommands from "./zone-events"
import type { ClosePopupEvent } from '../Events/ClosePopupEvent';
import { apiCallback, IframeApiContribution, sendToWorkadventure } from './IframeApiContribution';
import zoneCommands from "./zone-events";
class Popup {
constructor(private id: number) {
}