fixed a bug where livewpm could not be used with keymap

fixed a bug where keymap would remain visible after disabling it
This commit is contained in:
Jack 2020-08-04 14:14:46 +01:00
parent 7621bf7f61
commit d3b76081ac
2 changed files with 13 additions and 12 deletions

View file

@ -2069,6 +2069,8 @@ function restartTest(withSameWordset = false) {
}
if (config.keymapMode !== "off") {
showKeymap();
} else {
hideKeymap();
}
if (activeFunBox === "layoutfluid") {
@ -2319,6 +2321,11 @@ function showLiveWpm() {
if (!config.showLiveWpm) return;
if (!testActive) return;
$("#liveWpm").css("opacity", config.timerOpacity);
if (config.keymapMode !== "off") {
$("#liveWpm").addClass("lower");
} else {
$("#liveWpm").removeClass("lower");
}
// if (config.timerStyle === "text") {
// $("#timerNumber").css("opacity", config.timerOpacity);
// }

View file

@ -358,17 +358,17 @@ function setShowLiveWpm(live, nosave) {
live = false;
}
config.showLiveWpm = live;
if (config.keymapMode !== "off") {
config.keymapMode = "off";
}
// if (config.keymapMode !== "off") {
// config.keymapMode = "off";
// }
if (!nosave) saveConfigToCookie();
}
function toggleShowLiveWpm() {
config.showLiveWpm = !config.showLiveWpm;
if (config.keymapMode !== "off") {
config.keymapMode = "off";
}
// if (config.keymapMode !== "off") {
// config.keymapMode = "off";
// }
saveConfigToCookie();
}
@ -759,12 +759,6 @@ function changeKeymapMode(mode, nosave) {
if (mode == null || mode == undefined) {
mode = "off";
}
if (mode === "off") {
// hideKeymap();
$("#liveWpm").removeClass("lower");
} else {
$("#liveWpm").addClass("lower");
}
if (mode === "react") {
$(".active-key").removeClass("active-key");
}