From e2d78501fa9d9aab175ddcb6a53efbcc22958ca8 Mon Sep 17 00:00:00 2001 From: Jack Date: Mon, 15 Jun 2020 22:15:10 +0100 Subject: [PATCH] added max confidence mode --- public/index.html | 8 ++++++++ public/js/commandline.js | 7 +++++++ public/js/script.js | 1 + public/js/settings.js | 20 +++++++++++++++++++- public/js/userconfig.js | 36 +++++++++++++++++++++++++++++++++++- 5 files changed, 70 insertions(+), 2 deletions(-) diff --git a/public/index.html b/public/index.html index 691319729..91de71752 100644 --- a/public/index.html +++ b/public/index.html @@ -316,6 +316,14 @@
off
+
+

max confidence

+
When enabled, you will not be able to go back to previous words to fix mistakes.
+
+
on
+
off
+
+

blind mode

No errors or incorrect words are highlighted. Helps you to focus on raw speed. If enabled, quick end is recommended.
diff --git a/public/js/commandline.js b/public/js/commandline.js index 6bcf7c7cc..f48af328a 100644 --- a/public/js/commandline.js +++ b/public/js/commandline.js @@ -57,6 +57,13 @@ let commands = { toggleFreedomMode(); } }, + { + id: "toggleMaxConfidence", + display: "Toggle max confidence", + exec: () => { + toggleMaxConfidence(); + } + }, { id: "toggleBlindMode", display: "Toggle blind mode", diff --git a/public/js/script.js b/public/js/script.js index 13fed924b..eedd467d0 100644 --- a/public/js/script.js +++ b/public/js/script.js @@ -1714,6 +1714,7 @@ $(document).keydown((event) => { ) { return; } else { + if(config.maxConfidence) return; if (event["ctrlKey"] || event["altKey"]) { currentInput = ""; inputHistory.pop(); diff --git a/public/js/settings.js b/public/js/settings.js index 284ab3774..13e65f917 100644 --- a/public/js/settings.js +++ b/public/js/settings.js @@ -64,7 +64,7 @@ function updateSettingsPage(){ setSettingsButton('flipTestColors', config.flipTestColors); setSettingsButton('discordDot', config.showDiscordDot); setSettingsButton('extraTestColor', config.extraTestColor); - + setSettingsButton('maxConfidence', config.maxConfidence); setActiveThemeButton(); setActiveLanguageButton(); @@ -192,12 +192,30 @@ $(".pageSettings .section.freedomMode .buttons .button.on").click(e => { saveConfigToCookie(); showNotification('Freedom mode on', 1000); setSettingsButton('freedomMode', config.freedomMode); + setSettingsButton('maxConfidence', config.maxConfidence); }) $(".pageSettings .section.freedomMode .buttons .button.off").click(e => { setFreedomMode(false); saveConfigToCookie(); showNotification('Freedom mode off', 1000); setSettingsButton('freedomMode', config.freedomMode); + setSettingsButton('maxConfidence', config.maxConfidence); +}) + +//max confidence +$(".pageSettings .section.maxConfidence .buttons .button.on").click(e => { + setMaxConfidence(true); + saveConfigToCookie(); + showNotification('Max confidence on', 1000); + setSettingsButton('freedomMode', config.freedomMode); + setSettingsButton('maxConfidence', config.maxConfidence); +}) +$(".pageSettings .section.maxConfidence .buttons .button.off").click(e => { + setMaxConfidence(false); + saveConfigToCookie(); + showNotification('Max confidence off', 1000); + setSettingsButton('freedomMode', config.freedomMode); + setSettingsButton('maxConfidence', config.maxConfidence); }) //keytips diff --git a/public/js/userconfig.js b/public/js/userconfig.js index fe8ed53b7..575c3f811 100644 --- a/public/js/userconfig.js +++ b/public/js/userconfig.js @@ -19,7 +19,8 @@ let defaultConfig = { caretStyle: "default", flipTestColors: false, layout:"default", - showDiscordDot: true + showDiscordDot: true, + maxConfidence: false } let config = defaultConfig; @@ -58,6 +59,7 @@ function loadConfigFromCookie() { setFlipTestColors(newConfig.flipTestColors,true); setDiscordDot(newConfig.hideDiscordDot,true); setExtraTestColor(newConfig.extraTestColor,true); + setMaxConfidence(newConfig.maxConfidence,true); if(newConfig.resultFilters == null || newConfig.resultFilters == undefined){ newConfig.resultFilters = ["all"]; } @@ -331,14 +333,46 @@ function togglePunctuation() { //freedom function setFreedomMode(freedom, nosave) { config.freedomMode = freedom; + if(config.freedomMode && config.maxConfidence){ + config.maxConfidence = false; + } if(!nosave) saveConfigToCookie(); } function toggleFreedomMode() { config.freedomMode = !config.freedomMode; + if(config.freedomMode && config.maxConfidence){ + config.maxConfidence = false; + } saveConfigToCookie(); } +//max confidence +function toggleMaxConfidence(){ + // console.log(config.maxConfidence) + mc = !config.maxConfidence; + if(mc == undefined){ + mc = false; + } + config.maxConfidence = mc; + if(config.freedomMode && config.maxConfidence){ + config.freedomMode = false; + } + // console.log(config.maxConfidence); + saveConfigToCookie(); +} + +function setMaxConfidence(mc, nosave){ + if(mc == undefined){ + mc = false; + } + config.maxConfidence = mc; + if(config.freedomMode && config.maxConfidence){ + config.freedomMode = false; + } + if(!nosave) saveConfigToCookie(); +} + function previewTheme(name) { $("#currentTheme").attr("href", `themes/${name}.css`); }