monkeytypegame/monkeytype
1
1
Fork 0
mirror of https://github.com/monkeytypegame/monkeytype.git synced 2024-09-22 16:26:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

setting state when overriding custom text

Browse source
This commit is contained in:
Miodec 2023-03-24 12:51:36 +01:00
parent e6eed80b97
commit 2d06bdce30
4 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frontend/src/ts/controllers/challenge-controller.ts
View file

@ -231,6 +231,7 @@ export async function setup(challengeName: string): Promise<boolean> {
UpdateConfig.setMode("words", true);
UpdateConfig.setDifficulty("normal", true);
} else if (challenge.type === "customText") {
CustomText.setPopupTextareaState(challenge.parameters[0] as string);
CustomText.setText((challenge.parameters[0] as string).split(" "));
CustomText.setIsTimeRandom(false);
CustomText.setIsWordRandom(challenge.parameters[1] as boolean);
@ -249,6 +250,7 @@ export async function setup(challengeName: string): Promise<boolean> {
let text = scriptdata.trim();
text = text.replace(/[\n\r\t ]/gm, " ");
text = text.replace(/ +/gm, " ");
CustomText.setPopupTextareaState(text);
CustomText.setText(text.split(" "));
CustomText.setIsWordRandom(false);
CustomText.setTime(-1);

1
frontend/src/ts/test/practise-words.ts
View file

@ -93,6 +93,7 @@ export function init(missed: boolean, slow: boolean): boolean {
const numbers = before.numbers === null ? Config.numbers : before.numbers;
UpdateConfig.setMode("custom", true);
CustomText.setPopupTextareaState(newCustomText.join(CustomText.delimiter));
CustomText.setText(newCustomText);
CustomText.setIsWordRandom(true);
CustomText.setIsTimeRandom(false);

5
frontend/src/ts/test/test-logic.ts
View file

@ -1681,11 +1681,14 @@ export async function finish(difficultyFailed = false): Promise<void> {
let newText = CustomText.getCustomText(customTextName, true);
newText = newText.slice(newProgress);
CustomText.setPopupTextareaState(newText.join(CustomText.delimiter));
CustomText.setText(newText);
} else {
// They finished the test
CustomText.setCustomTextLongProgress(customTextName, 0);
CustomText.setText(CustomText.getCustomText(customTextName, true));
const text = CustomText.getCustomText(customTextName, true);
CustomText.setPopupTextareaState(text.join(CustomText.delimiter));
CustomText.setText(text);
Notifications.add("Long custom text completed", 1, {
duration: 5,
important: true,

3
frontend/src/ts/utils/url-handler.ts
View file

@ -124,6 +124,9 @@ export function loadTestSettingsFromUrl(getOverride?: string): void {
if (de[2]) {
const customTextSettings = de[2];
CustomText.setPopupTextareaState(
customTextSettings["text"].join(customTextSettings["delimiter"])
);
CustomText.setText(customTextSettings["text"]);
CustomText.setIsTimeRandom(customTextSettings["isTimeRandom"]);
CustomText.setIsWordRandom(customTextSettings["isWordRandom"]);