starnakin/42_ft_transcendence
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: history.pushState before router

Browse Source
This commit is contained in:
starnakin 2024-02-13 14:19:12 +01:00
parent c8cb25b0fc
commit b398134101
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
frontend/static/js/index.js
View File

@ -36,11 +36,12 @@ const getParams = match => {
}; };
const navigateTo = async (uri) => { const navigateTo = async (uri) => {
if (await router(uri) !== 0)
return;
history.pushState(null, null, uri); history.pushState(null, null, uri);
if (await router(uri) !== 0)
return;
let link = document.querySelector('a[href=\'' + location.pathname + '\']'); let link = document.querySelector('a[href=\'' + location.pathname + '\']');
if (link) { if (link) {
document.querySelector('[data-link].active')?.classList.remove('active'); document.querySelector('[data-link].active')?.classList.remove('active');

2
frontend/static/js/views/accounts/AuthenticationView.js
View File

@ -107,7 +107,7 @@ export default class extends AbstractNonAuthenticatedView
let toggle_register_login_text = this.current_mode === "register" ? "registerLogin" : "loginRegister"; let toggle_register_login_text = this.current_mode === "register" ? "registerLogin" : "loginRegister";
toggle_register_login.innerText = lang.get(toggle_register_login_text, "ERROR LANG"); toggle_register_login.innerText = lang.get(toggle_register_login_text, "ERROR LANG");
let button_text = this.current_mode === "login" ? "loginFormButton" : "registerFormButton"; let button_text = this.current_mode === "register" ? "registerFormButton" : "loginFormButton";
button.innerText = lang.get(button_text, "ERROR LANG"); button.innerText = lang.get(button_text, "ERROR LANG");
} }