_Bastler/partey_workadventure
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' of github.com:thecodingmachine/workadventure

Browse Source
This commit is contained in:
_Bastler 2021-10-15 16:07:01 +02:00
commit 315be013e6
2 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
front/src/Components/Menu/AboutRoomSubMenu.svelte
View File

@ -51,6 +51,7 @@
await navigator.share(shareData); await navigator.share(shareData);
} catch (err) { } catch (err) {
console.error('Error: ' + err); console.error('Error: ' + err);
copyLink();
} }
} }
</script> </script>
@ -63,6 +64,7 @@
</section> </section>
<section class="is-mobile"> <section class="is-mobile">
<h3>Share the link of the room !</h3> <h3>Share the link of the room !</h3>
<input type="hidden" readonly bind:this={HTMLShareLink} value={location.toString()}>
<button type="button" class="nes-btn is-primary" on:click={shareLink}>Share</button> <button type="button" class="nes-btn is-primary" on:click={shareLink}>Share</button>
</section> </section>
<h2>Information on the map</h2> <h2>Information on the map</h2>

20
front/src/Phaser/Game/GameScene.ts
View File

@ -1232,26 +1232,6 @@ export class GameScene extends DirtyScene {
layoutManagerActionStore.removeAction(message.uuid); layoutManagerActionStore.removeAction(message.uuid);
}); });
this.iframeSubscriptionList.push(
iframeListener.modifyEmbeddedWebsiteStream.subscribe((embeddedWebsite) => {
// TODO
// TODO
// TODO
// TODO
// TODO
// TODO
// TODO
// TODO
// TODO
// TODO
// TODO
// TODO
// TODO
// TODO
// TODO
// TODO
})
);
} }
private setPropertyLayer( private setPropertyLayer(