esoko/mapguesser
esoko/mapguesser
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 18 Wiki Activity

Merge pull request 'MAPG-207 don't use MapGuesser.showmodal for modal 'multi'' (#12) from bugfix/MAPG-207-prevent-closing-multi-modal into develop
All checks were successful
default-pipeline default-pipeline #50
Details

Browse Source 
Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/12
This commit is contained in:
Bence Pőcze 2021-03-21 12:47:35 +01:00 committed by Gitea
commit 71681f1e55
No known key found for this signature in database
GPG Key ID: 2E27A8C281A1CC2C
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
public/static/js/game.js
View File

@ -107,8 +107,8 @@
Game.panoId = data.place.panoId; Game.panoId = data.place.panoId;
Game.pov = data.place.pov; Game.pov = data.place.pov;
document.getElementById('multi').style.visibility = 'hidden';
document.getElementById('panoCover').style.visibility = 'hidden'; document.getElementById('panoCover').style.visibility = 'hidden';
MapGuesser.hideModal();
Game.startNewRound(); Game.startNewRound();
} }
@ -153,7 +153,7 @@
Game.panoId = data.place.panoId; Game.panoId = data.place.panoId;
Game.pov = data.place.pov; Game.pov = data.place.pov;
MapGuesser.hideModal(); document.getElementById('multi').style.visibility = 'hidden';
Game.resetRound(); Game.resetRound();
Game.startNewRound(); Game.startNewRound();
} }
@ -188,7 +188,7 @@
Game.multi.token = this.response.token; Game.multi.token = this.response.token;
Game.multi.owner = this.response.owner; Game.multi.owner = this.response.owner;
MapGuesser.showModal('multi'); document.getElementById('multi').style.visibility = 'visible';
if (Game.multi.owner) { if (Game.multi.owner) {
document.getElementById('startMultiGameButton').style.display = 'block'; document.getElementById('startMultiGameButton').style.display = 'block';
} }
@ -721,7 +721,7 @@
return; return;
} }
MapGuesser.hideModal(); document.getElementById('multi').style.visibility = 'hidden';
document.getElementById('loading').style.visibility = 'visible'; document.getElementById('loading').style.visibility = 'visible';
MapGuesser.httpRequest('POST', '/multiGame/' + roomId + '/initialData.json', function () { MapGuesser.httpRequest('POST', '/multiGame/' + roomId + '/initialData.json', function () {