From d3b76081aca9c065181bcb34b128704b6cf11fe1 Mon Sep 17 00:00:00 2001
From: Jack <bartnikjack@gmail.com>
Date: Tue, 4 Aug 2020 14:14:46 +0100
Subject: [PATCH] fixed a bug where livewpm could not be used with keymap fixed
 a bug where keymap would remain visible after disabling it

---
 public/js/script.js     |  7 +++++++
 public/js/userconfig.js | 18 ++++++------------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/public/js/script.js b/public/js/script.js
index 035c64f41..f31b5deb1 100644
--- a/public/js/script.js
+++ b/public/js/script.js
@@ -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);
   // }
diff --git a/public/js/userconfig.js b/public/js/userconfig.js
index a9abe4175..cb67ba772 100644
--- a/public/js/userconfig.js
+++ b/public/js/userconfig.js
@@ -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");
   }