tom/METH_Transcendence
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Site

Browse Source 
- fix bug on login button when use private firefox
This commit is contained in:
Kum1ta
2024-09-18 20:36:28 +02:00
parent e85f4d33a4
commit bfff2d124b
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docker-compose/requirements/nginx/static/javascript/Page.js
View File

@ -6,7 +6,7 @@
/* By: edbernar <edbernar@student.42angouleme. +#+ +:+ +#+ */ /* By: edbernar <edbernar@student.42angouleme. +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/08/25 00:00:21 by edbernar #+# #+# */ /* Created: 2024/08/25 00:00:21 by edbernar #+# #+# */
/* Updated: 2024/09/15 15:48:43 by edbernar ### ########.fr */ /* Updated: 2024/09/18 20:13:45 by edbernar ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -80,7 +80,7 @@ class Page
}) })
.catch(error => { .catch(error => {
window.location.href = '/'; window.location.href = '/';
throw Error(error); // throw Error(error);
}); });
return ; return ;

4
docker-compose/requirements/nginx/static/javascript/home3D/Screen.js
View File

@ -6,7 +6,7 @@
/* By: edbernar <edbernar@student.42angouleme. +#+ +:+ +#+ */ /* By: edbernar <edbernar@student.42angouleme. +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/08/22 23:13:53 by edbernar #+# #+# */ /* Created: 2024/08/22 23:13:53 by edbernar #+# #+# */
/* Updated: 2024/08/25 02:16:17 by edbernar ### ########.fr */ /* Updated: 2024/09/18 20:18:51 by edbernar ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -128,7 +128,7 @@ class Screen
texture.needsUpdate = true; texture.needsUpdate = true;
video.play().then(() => { video.play().then(() => {
updateCanvas(); updateCanvas();
}).catch(err => console.error("Error playing video: ", err)); });
}); });
function updateCanvas() function updateCanvas()

4
docker-compose/requirements/nginx/static/javascript/login/main.js
View File

@ -6,7 +6,7 @@
/* By: edbernar <edbernar@student.42angouleme. +#+ +:+ +#+ */ /* By: edbernar <edbernar@student.42angouleme. +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/08/07 17:40:15 by edbernar #+# #+# */ /* Created: 2024/08/07 17:40:15 by edbernar #+# #+# */
/* Updated: 2024/09/18 19:51:45 by edbernar ### ########.fr */ /* Updated: 2024/09/18 20:30:09 by edbernar ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -42,7 +42,7 @@ class Login
} }
else else
{ {
waitForLogin().then(() => { waitForLogin().then((aa) => {
if (userMeInfo.id !== -1) if (userMeInfo.id !== -1)
{ {
nodeText = document.createTextNode(userMeInfo.username); nodeText = document.createTextNode(userMeInfo.username);

12
docker-compose/requirements/nginx/static/javascript/typeResponse/typeLogin.js
View File

@ -6,7 +6,7 @@
/* By: edbernar <edbernar@student.42angouleme. +#+ +:+ +#+ */ /* By: edbernar <edbernar@student.42angouleme. +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/08/02 00:39:53 by edbernar #+# #+# */ /* Created: 2024/08/02 00:39:53 by edbernar #+# #+# */
/* Updated: 2024/09/18 19:45:25 by edbernar ### ########.fr */ /* Updated: 2024/09/18 20:33:20 by edbernar ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -18,14 +18,14 @@ let userMeInfo = {
}; };
let loginAvailable = false; let loginAvailable = false;
let loginResolve = null; let loginResolve = [];
function waitForLogin() { function waitForLogin() {
return new Promise((resolve) => { return new Promise((resolve) => {
if (loginAvailable) if (loginAvailable)
resolve(userMeInfo); resolve(userMeInfo);
else else
loginResolve = resolve; loginResolve.push(resolve);
}); });
} }
@ -54,10 +54,10 @@ function typeLogin(content)
} }
} }
loginAvailable = true; loginAvailable = true;
if (loginResolve) if (loginResolve != [])
{ {
loginResolve(content); loginResolve.forEach(func => func(content));
loginResolve = null; loginResolve = [];
} }
// }, 100); // }, 100);
} }