From d4ddacc8430f5deabb6acb41fc5a98647354c8fe Mon Sep 17 00:00:00 2001 From: Abdelrahman Date: Sun, 10 Dec 2023 11:23:40 +0000 Subject: [PATCH 1/2] Close Video after popup close --- game/static/game/js/drawing.js | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/game/static/game/js/drawing.js b/game/static/game/js/drawing.js index 806551491..4c6339b73 100644 --- a/game/static/game/js/drawing.js +++ b/game/static/game/js/drawing.js @@ -1013,6 +1013,14 @@ ocargo.Drawing.translate = function (coordinate) { return new ocargo.Coordinate(coordinate.x, GRID_HEIGHT - 1 - coordinate.y) } +// A Function used to stop the iframe video +function stopVideo() { + // https://gist.github.com/cferdinandi/9044694 + const video = document.getElementsByClassName("video"); + var iframeSrc = video[0].src; + video[0].src = iframeSrc; +} + /* This is the function that starts the pop-up. Buttons should be passed in separately to the function instead of concatenating @@ -1073,6 +1081,11 @@ ocargo.Drawing.startPopup = function ( const regexID = /id=\"*\w+_\w+\"/ + // Close the video on pressing the top right close button + $("#close-modal").click(function () { + stopVideo(); + }); + for (let i = 0; i < buttons.length; i++) { // get id with regex by stripping the html content let currentID = buttons[i].match(regexID)[0].slice(3).replaceAll('"', '') @@ -1088,6 +1101,11 @@ ocargo.Drawing.startPopup = function ( currentButton.attr("onclick", currentLink) } + // Close the video on the play button + currentButton.click(function () { + stopVideo(); + }); + // first level shouldn't have prev_button // and last level shouldn't have next_button if (currentButton.attr("onclick")) buttonDiv.append(currentButton) From c813fdf8204681f1bb8fb81b2ca1b2ee430e4c2c Mon Sep 17 00:00:00 2001 From: Abdelrahman Date: Wed, 13 Dec 2023 07:30:30 +0000 Subject: [PATCH 2/2] Replace var with const --- game/static/game/js/drawing.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/game/static/game/js/drawing.js b/game/static/game/js/drawing.js index 4c6339b73..b14f6bb24 100644 --- a/game/static/game/js/drawing.js +++ b/game/static/game/js/drawing.js @@ -1017,7 +1017,7 @@ ocargo.Drawing.translate = function (coordinate) { function stopVideo() { // https://gist.github.com/cferdinandi/9044694 const video = document.getElementsByClassName("video"); - var iframeSrc = video[0].src; + const iframeSrc = video[0].src; video[0].src = iframeSrc; }