From 8a6449195240d311979679aac64c8aef6cbee861 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20N=C3=A9grier?= <d.negrier@thecodingmachine.com>
Date: Wed, 18 Aug 2021 11:53:41 +0200
Subject: [PATCH] Improving popup

If a popup message is empty, only the buttons will be displayed (not the container)

Unrelated: the Sound.play method in the API now accepts 0 arguments.
---
 front/src/Api/iframe/Sound/Sound.ts | 33 +++++++++++++----------------
 front/src/Phaser/Game/GameScene.ts  | 10 ++++++++-
 2 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/front/src/Api/iframe/Sound/Sound.ts b/front/src/Api/iframe/Sound/Sound.ts
index 3bb3251a..132176c2 100644
--- a/front/src/Api/iframe/Sound/Sound.ts
+++ b/front/src/Api/iframe/Sound/Sound.ts
@@ -1,38 +1,35 @@
-import {sendToWorkadventure} from "../IframeApiContribution";
-import type {LoadSoundEvent} from "../../Events/LoadSoundEvent";
-import type {PlaySoundEvent} from "../../Events/PlaySoundEvent";
-import type {StopSoundEvent} from "../../Events/StopSoundEvent";
+import { sendToWorkadventure } from "../IframeApiContribution";
+import type { LoadSoundEvent } from "../../Events/LoadSoundEvent";
+import type { PlaySoundEvent } from "../../Events/PlaySoundEvent";
+import type { StopSoundEvent } from "../../Events/StopSoundEvent";
 import SoundConfig = Phaser.Types.Sound.SoundConfig;
 
 export class Sound {
     constructor(private url: string) {
         sendToWorkadventure({
-            "type": 'loadSound',
-            "data": {
+            type: "loadSound",
+            data: {
                 url: this.url,
-            } as LoadSoundEvent
-
+            } as LoadSoundEvent,
         });
     }
 
-    public play(config: SoundConfig) {
+    public play(config: SoundConfig | undefined) {
         sendToWorkadventure({
-            "type": 'playSound',
-            "data": {
+            type: "playSound",
+            data: {
                 url: this.url,
-                config
-            } as PlaySoundEvent
-
+                config,
+            } as PlaySoundEvent,
         });
         return this.url;
     }
     public stop() {
         sendToWorkadventure({
-            "type": 'stopSound',
-            "data": {
+            type: "stopSound",
+            data: {
                 url: this.url,
-            } as StopSoundEvent
-
+            } as StopSoundEvent,
         });
         return this.url;
     }
diff --git a/front/src/Phaser/Game/GameScene.ts b/front/src/Phaser/Game/GameScene.ts
index d396c58b..9a5d8f27 100644
--- a/front/src/Phaser/Game/GameScene.ts
+++ b/front/src/Phaser/Game/GameScene.ts
@@ -953,9 +953,13 @@ export class GameScene extends DirtyScene {
                     return;
                 }
                 const escapedMessage = HtmlUtils.escapeHtml(openPopupEvent.message);
-                let html = `<div id="container" hidden><div class="nes-container with-title is-centered">
+                let html = '<div id="container" hidden>';
+                if (escapedMessage) {
+                    html += `<div class="nes-container with-title is-centered">
 ${escapedMessage}
  </div> `;
+                }
+
                 const buttonContainer = '<div class="buttonContainer"</div>';
                 html += buttonContainer;
                 let id = 0;
@@ -985,7 +989,11 @@ ${escapedMessage}
                     const btnId = id;
                     button.onclick = () => {
                         iframeListener.sendButtonClickedEvent(openPopupEvent.popupId, btnId);
+                        // Disable for a short amount of time to let time to the script to remove the popup
                         button.disabled = true;
+                        setTimeout(() => {
+                            button.disabled = false;
+                        }, 100);
                     };
                     id++;
                 }