monkeytypegame/monkeytype
1
1
Fork 0
mirror of https://github.com/monkeytypegame/monkeytype.git synced 2026-01-02 05:24:50 +08:00
Code Issues Projects Releases Packages Wiki Activity

hiding back to lobby button before everyone is ready

Browse source 
allowing tab nav in tribe result screen
hiding restart test button
This commit is contained in:
Miodec 2021-02-01 05:26:23 +00:00
parent 6316c915c9
commit 3b1b077269
2 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/js/script.js
View file

@ -1881,7 +1881,7 @@ function showResult(difficultyFailed = false, mp_outOfTime = false) {
$(".pageTest #practiseMissedWordsButton").addClass("hidden");
$(".pageTest #result .tribeResultChat").removeClass("hidden");
if (MP.room.isLeader) {
$(".pageTest #backToLobbyButton").removeClass("hidden");
// $(".pageTest #backToLobbyButton").removeClass("hidden");
// $(".pageTest #nextTestButton").removeClass("hidden");
$(".pageTest #readyButton").addClass("hidden");
}
@ -5116,6 +5116,10 @@ function handleTab(event) {
// $("#customTextPopup .textarea").val() + "\t"
// );
return;
} else if (MP.state > 10) {
if (MP.state < 28) {
event.preventDefault();
}
} else if (
!event.ctrlKey &&
((!event.shiftKey && !textHasTab) ||
@ -5163,14 +5167,10 @@ function handleTab(event) {
!config.quickTab &&
textHasTab &&
event.shiftKey &&
!resultVisible &&
MP.state < 20
!resultVisible
) {
event.preventDefault();
$("#restartTestButton").focus();
} else if (MP.state >= 20) {
event.preventDefault();
return;
}
}

10
src/js/tribe.js
View file

@ -937,6 +937,7 @@ MP.socket.on("mp_room_readyResultTimer_over", (data) => {
hideResultCountdown();
if (MP.room.isLeader) {
$(".pageTest #nextTestButton").removeClass("hidden");
$(".pageTest #backToLobbyButton").removeClass("hidden");
}
});
@ -956,6 +957,7 @@ MP.socket.on("mp_room_test_init", (data) => {
restartTest(false, true, true);
showCountdown();
hideResultCountdown();
$(".pageTest #restartTestButton").addClass("hidden");
});
MP.socket.on("mp_room_state_update", (data) => {
@ -1394,6 +1396,14 @@ $(
MP.socket.emit("mp_user_ready");
});
$(
".pageTribe .lobby .lobbyButtons .userReadyButton, .pageTest #result #readyButton"
).on("keypress", "#nextTestButton", (event) => {
if (event.keyCode == 13) {
MP.socket.emit("mp_user_ready");
}
});
$(".pageTest #result #backToLobbyButton").click((e) => {
MP.socket.emit("mp_room_back_to_lobby");
});