Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Minor bugfixes & License update #34

Merged
merged 2 commits into from
Aug 9, 2023
Merged

Minor bugfixes & License update #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5afdee1
Update license year & redirect from login to wait
kendlbat Aug 9, 2023
b8c53e4
Update game id with status poll to remove undefined bug
kendlbat Aug 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright 2022 Tobias Kendlbacher & Contributors
Copyright 2023 Tobias Kendlbacher & Contributors

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

Expand Down
1 change: 1 addition & 0 deletions public/components/waitScreen.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
window.x.statusPoll = () => {
window.x.APIHandler.status().then((status) => {
window.x.statusPrint(status);
document.querySelector("#waitScreenComp-code").innerText = status.gameId;
if (status.state == "starting") {
window.x.statusPoll = () => { return undefined };
window.x.loadComponent("components/pregame.html", document.querySelector("#componentContainer"));
Expand Down
4 changes: 3 additions & 1 deletion public/script.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,9 @@ async function main() {
APIHandler.quit();
loadComponent("components/login.html", document.querySelector("#componentContainer"));
} else if (status.status == "ok") {
if (status.state == "starting") {
if (status.state == "waiting") {
loadComponent("components/waitScreen.html", document.querySelector("#componentContainer"));
} else if (status.state == "starting") {
loadComponent("components/pregame.html", document.querySelector("#componentContainer"));
} else if (status.state == "playing") {
loadComponent("components/playing.html", document.querySelector("#componentContainer"));
Expand Down