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

develop merge

Browse source
This commit is contained in:
jonny 2021-06-17 11:30:16 +02:00
parent d416deec5e
commit 318749e5a8
10 changed files with 311 additions and 696 deletions
Download patch file Download diff file Expand all files Collapse all files

6
front/src/Api/iframe/Navigation.ts
View file

@ -3,7 +3,7 @@ import type { OpenTabEvent } from '../Events/OpenTabEvent';
import { IframeApiContribution, sendToWorkadventure } from './IframeApiContribution';
import {LoadPageEvent} from "../Events/LoadPageEvent";
import type { LoadPageEvent } from '../Events/LoadPageEvent';
class WorkadventureNavigationCommands extends IframeApiContribution<WorkadventureNavigationCommands> {
@ -37,7 +37,11 @@ class WorkadventureNavigationCommands extends IframeApiContribution<Workadventur
"data" : {
url
} as LoadPageEvent
<<<<<<< Updated upstream
},'*');
=======
},'*');
>>>>>>> Stashed changes
}
}

1
front/src/iframe_api.ts
View file

@ -9,6 +9,7 @@ import popupApi from "./Api/iframe/popup";
import Sound from "./Api/iframe/Sound";
import zoneRvents from "./Api/iframe/zone-events";
import type { WorkAdventureApi } from './iframe_api.d';
import type { LoadPageEvent } from './Api/Events/LoadPageEvent';
export const registeredCallbacks: { [K in keyof IframeResponseEventMap]?: IframeCallback<K> } = {}