Command hotkeys escaped instead of executed Techtonica#45

KatShambaugh · Oct 1, 2020 · b09969a · b09969a
1 parent d1c7d7c
commit b09969a
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 53 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -23,7 +23,7 @@
     "dotenv": "^8.1.0",
     "ejs": "^3.0.1",
     "express": "^4.17.1",
-    "http-server": "^0.11.1",
+    "http-server": "^0.12.3",
     "morgan": "^1.9.1",
     "mysql": "^2.17.1",
     "path": "^0.12.7",

diff --git a/public/scripts/main.js b/public/scripts/main.js
@@ -5,6 +5,7 @@ var reqKeys = []
 var typewriter;
 var quesNo;
 let pressed = new Set();
+var commandDown = false;
 
 // event.keyCode Chrome and Firefox
 const CHROME_LEFT_COMMAND_CODE = 91;
@@ -82,6 +83,9 @@ function handle(e) {
     $("#"+e.code.toLowerCase()).toggleClass("pressed");
   }
   if(e.key.toLowerCase()=="alt" || e.key.toLowerCase()=="shift" || e.key.toLowerCase()=="meta"){
+    if (e.key.toLowerCase()=="meta") {
+      commandDown = true;
+    }
     let keyString = e.code;
     if(e.code == FIREFOX_LEFT_COMMAND_STRING) {
       keyString = CHROME_LEFT_COMMAND_STRING
@@ -100,7 +104,14 @@ function handle(e) {
     $('.letter').toggleClass('uppercase');
     caps=false;
   }
-  else $("#"+e.key.toLowerCase() ).addClass("pressed");
+  else {
+    if (commandDown) {
+      e.preventDefault();
+      e.stopPropagation();
+      return false;
+    }
+    $("#"+e.key.toLowerCase() ).addClass("pressed");
+  }
 }
 
 // Function called on KeyUp to reset the key by removing class = 'pressed'
@@ -109,6 +120,9 @@ function release(e) {
     $("#"+e.code.toLowerCase()).removeClass("pressed");
   }
   if(e.key.toLowerCase()=="alt" || e.key.toLowerCase()=="shift" || e.key.toLowerCase()=="meta"){
+    if (e.key.toLowerCase()=="meta") {
+      commandDown = false;
+    }
     let keyString = e.code;
     if(e.code == FIREFOX_LEFT_COMMAND_STRING) {
       keyString = CHROME_LEFT_COMMAND_STRING