Entering HH in speaking game clears input

The common words are lowercase and our submit check didn't account for that
(because all the morse shorthands are uppercase)

index.html

@@ -8,7 +8,7 @@
 		
 		<meta name="generator" content="Hugo 0.64.1">
 		<title>Little games to play with Morse Code in your browser · Caffeinspiration</title>
-		<link rel="shortcut icon" href="https://alexanderell.is/images/favicon.ico">
+		<link rel="shortcut icon" href="">
 		<link rel="stylesheet" href="morse-code_files/style.css">
 		<link rel="stylesheet" href="morse-code_files/highlight.css">
 		
@@ -130,8 +130,17 @@ up a letter faster.
   <input type="radio" id="difficultyHard" name="difficulty" value="hard">
   <label for="difficultyHard">Hard (multiple short words)</label>
   <br>
+  <input type="radio" id="difficultyMorseEasy" name="difficulty" value="morse-easy">
+  <label for="difficultyMorseEasy">Morse easy (morse code shorthand)</label>
+  <br>
+  <input type="radio" id="difficultyMorseHard" name="difficulty" value="morse-hard">
+  <label for="difficultyMorseHard">Morse hard (multiple morse shorthand)</label>
+  <br>
   <input type="radio" id="difficultyVeryHard" name="difficulty" value="really-hard">
   <label for="difficultyVeryHard">Very Hard (multiple words)</label>
+  <br>
+  <input type="radio" id="difficultySymbols" name="difficulty" value="symbols">
+  <label for="difficultySymbols">(symbols)</label>
 </div>
 <br>
 <br>
@@ -153,10 +162,10 @@ up a letter faster.
 <br>
 <legend>Use the Farnsworth method?</legend>
 <div>
-  <input type="radio" id="yesFarnsworth" name="farnsworth" value="yes" checked="checked">
+  <input type="radio" id="yesFarnsworth" name="farnsworth" value="yes">
   <label for="yesFarnsworth">Yes</label>
   <br>
-  <input type="radio" id="noFarnsworth" name="farnsworth" value="no">
+  <input type="radio" id="noFarnsworth" name="farnsworth" value="no" checked="checked">
   <label for="noFarnsworth">No</label>
 </div>
 <br>

morse-code_files/morse-code.js

@@ -39,8 +39,6 @@ function stopNotePlaying() {
   $("#beepLamp").removeClass("lamp-on")
 }
 
-
-
 function sleep(ms) {
   return new Promise(resolve => setTimeout(resolve, ms));
 }
@@ -127,6 +125,11 @@ function convertAsciiSentenceToMorse(asciiSentence) {
   return splitSentence.map(convertAsciiWordToMorse);
 }
 
+function getRandomSymbol() {
+  const randomIndex = Math.floor(Math.random() * SYMBOLS.length);
+  return SYMBOLS[randomIndex];
+}
+
 function getRandomLetter() {
   const randomIndex = Math.floor(Math.random() * 26);
   return Object.keys(MORSE_MAP)[randomIndex];
@@ -137,6 +140,11 @@ function getRandomWord() {
   return EASY_WORDS[randomIndex];
 }
 
+function getRandomMorseWord() {
+  const randomIndex = Math.floor(Math.random() * MORSE_WORDS.length);
+  return MORSE_WORDS[randomIndex];
+}
+
 function getRandomEasyWords() {
   const totalLength = Math.floor(Math.random() * 3) + 2;
   let finalSentence = ''
@@ -149,11 +157,11 @@ function getRandomEasyWords() {
   return finalSentence;
 }
 
-function getRandomWords() {
+function getRandomMorseWords() {
   const totalLength = Math.floor(Math.random() * 4) + 2;
   let finalSentence = ''
   for (let i = 0; i < totalLength; i++) {
-    finalSentence += ALL_WORDS[Math.floor(Math.random() * ALL_WORDS.length)];
+    finalSentence += MORSE_WORDS[Math.floor(Math.random() * MORSE_WORDS.length)];
     if (i < totalLength - 1) {
       finalSentence += ' ';
     }
@@ -222,6 +230,16 @@ function getTarget() {
     case 'hard':
       target = getRandomEasyWords();
       break;
+    case 'morse-easy':
+      target = getRandomMorseWord();
+      break;
+    case 'morse-hard':
+      target = getRandomMorseWords();
+      break;
+    case 'symbols':
+      target = getRandomSymbol();
+      console.log(target);
+      break;
     default:
       target = getRandomWords();
       break;
@@ -285,7 +303,7 @@ class ListeningGame {
     } else {
       const enteredWord = this.wordInput.value;
       // console.log('enteredWord: ', enteredWord, 'target: ', this.target);
-      if (enteredWord.toUpperCase() == this.target) {
+      if (enteredWord.trim().toUpperCase() == this.target.trim().toUpperCase()) {
         // If they got the word, show message and switch event listener.
         this.statusElement.textContent = 'Correct! Press enter to play a new round.';
         this.messageFound = true;
@@ -522,7 +540,11 @@ class InputGame {
       // TODO: handle letter being done.
       const currentLetterCombo = this.dotAndDashStack.join('');
       if (currentLetterCombo in REVERSE_MORSE_MAP) {
-        this.letterStack.push(REVERSE_MORSE_MAP[currentLetterCombo]);
+        if (REVERSE_MORSE_MAP[currentLetterCombo] == "clear") {
+          this.letterStack = [];
+        } else {
+          this.letterStack.push(REVERSE_MORSE_MAP[currentLetterCombo]);
+        }
       } else {
         // Push a question mark
         this.letterStack.push('?');
@@ -608,7 +630,7 @@ class InputGame {
     // console.log('target: \'' + this.target + '\'');
     // console.log('this.letterStack.join(\'\'): \'' + this.letterStack.join('') + '\'');
     // console.log(this.letterStack.join('') == this.target);
-    if (this.letterStack.join('') == this.target) {
+    if (this.letterStack.join('').toUpperCase() == this.target.toUpperCase()) {
       // console.log('match!');
       // Clear intervals
       clearTimeout(this.letterTimeout);