Skip to content

Commit

Permalink
fix: 1476-Video sound keeps playing after closing the popup it's in (#…
Browse files Browse the repository at this point in the history
…1554)

* Close Video after popup close

* Merge branch 'master' into master

* Replace var with const

* Merge branch 'master' of https://github.com/AbdelrahmanDeghedy/rapid-router

* Merge branch 'master' into master

Co-Authored-By: Abdelrahman <[email protected]>
Co-Authored-By: Florian Aucomte <[email protected]>
  • Loading branch information
3 people authored Dec 15, 2023
1 parent b89bcde commit 86b9884
Showing 1 changed file with 18 additions and 0 deletions.
18 changes: 18 additions & 0 deletions game/static/game/js/drawing.js
Original file line number Diff line number Diff line change
Expand Up @@ -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");
const 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
Expand Down Expand Up @@ -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('"', '')
Expand All @@ -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)
Expand Down

0 comments on commit 86b9884

Please sign in to comment.