diff --git a/frontend/src/ts/test/test-logic.ts b/frontend/src/ts/test/test-logic.ts index 6f5d0db80..20c5a37aa 100644 --- a/frontend/src/ts/test/test-logic.ts +++ b/frontend/src/ts/test/test-logic.ts @@ -904,7 +904,17 @@ export async function init(): Promise { } let wordsBound = 100; - if (Config.showAllLines) { + if (Config.funbox === "plus_one") { + wordsBound = 2; + if (Config.mode === "words" && Config.words < wordsBound) { + wordsBound = Config.words; + } + } else if (Config.funbox === "plus_two") { + wordsBound = 3; + if (Config.mode === "words" && Config.words < wordsBound) { + wordsBound = Config.words; + } + } else if (Config.showAllLines) { if (Config.mode === "quote") { wordsBound = 100; } else if (Config.mode === "custom") { @@ -956,18 +966,6 @@ export async function init(): Promise { if (Config.mode === "words" && Config.words === 0) { wordsBound = 100; } - if (Config.funbox === "plus_one") { - wordsBound = 2; - if (Config.mode === "words" && Config.words < wordsBound) { - wordsBound = Config.words; - } - } - if (Config.funbox === "plus_two") { - wordsBound = 3; - if (Config.mode === "words" && Config.words < wordsBound) { - wordsBound = Config.words; - } - } if ( Config.mode == "time" || @@ -1133,11 +1131,7 @@ export async function init(): Promise { if (w === undefined) return; - if (Config.showAllLines) { - wordsBound = w.length; - } else { - wordsBound = Math.min(wordsBound, w.length); - } + wordsBound = Math.min(wordsBound, w.length); for (let i = 0; i < wordsBound; i++) { if (/\t/g.test(w[i])) {