fix: corrected controls to M1 m1 and j1 (#633)

Author: ellvix

src/js/constants.js

@@ -660,6 +660,7 @@ class Constants {
    * @default Array(10).fill(null)
    */
   mark = Array(10).fill(null);
+  markText = Array(10).fill(null);
 
   /**
    * Stops the autoplay if it is currently running.
@@ -1053,6 +1054,22 @@ class Menu {
                                         <td>Copy full chat history in AI Chat View</td>
                                         <td>${constants.alt} + Shift + A</td>
                                     </tr>
+                                    <tr>
+                                        <td>Mark current position</td>
+                                        <td>M # (Shift + m, then a number 0-9)</td>
+                                      </tr>
+                                      <tr>
+                                        <td>Play marked position</td>
+                                        <td>m # (m, then a number 0-9)</td>
+                                      </tr>
+                                      <tr>
+                                        <td>Jump to marked position</td>
+                                        <td>j # (j, then a number 0-9)</td>
+                                      </tr>
+                                      <tr>
+                                        <td>Goto location menu</td>
+                                        <td>g</td>
+                                      </tr>
                                 </tbody>
                             </table>
                         </div>

src/js/controls.js

@@ -551,7 +551,7 @@ class Control {
     ]);
 
     // mark and recall
-    // mark with M + # (0-9), recall with m + # (0-9)
+    // mark with M + # (0-9), play with m + # (0-9), jump to with j + #
     // available in chart and braille, not review
     let lastKeytime = 0;
     let lastKey = null;
@@ -569,17 +569,36 @@ class Control {
           if (lastKey == 'M' && /[0-9]/.test(key)) {
             const markIndex = parseInt(key, 10);
             constants.mark[markIndex] = JSON.parse(JSON.stringify(position)); // deep copy
+            constants.markText[markIndex] = JSON.parse(
+              JSON.stringify(constants.verboseText)
+            ); // deep copy
             display.announceText('Marked position ' + markIndex);
           }
 
-          // recall with m
-          if (lastKey == 'm' && /[0-9]/.test(key)) {
+          // jump with j
+          if (lastKey == 'j' && /[0-9]/.test(key)) {
             const recallIndex = parseInt(key, 10);
             if (constants.mark[recallIndex]) {
               position = JSON.parse(
                 JSON.stringify(constants.mark[recallIndex])
               ); // deep copy
               control.UpdateAll();
+            } else {
+              display.announceText(
+                'No position marked at index ' + recallIndex
+              );
+            }
+          }
+
+          // play with m
+          if (lastKey == 'm' && /[0-9]/.test(key)) {
+            const recallIndex = parseInt(key, 10);
+            if (constants.markText[recallIndex]) {
+              display.announceText(constants.markText[recallIndex]);
+            } else {
+              display.announceText(
+                'No position marked at index ' + recallIndex
+              );
             }
           }
         }

src/js/goto.js

@@ -38,9 +38,15 @@ class Goto {
   }
 
   openMenu() {
+    // save the current focus so we can return to it later
     this.whereWasMyFocus = document.activeElement;
     constants.tabMovement = 0; // to prevent maidr from being destroyed as we leave the chart
 
+    // clear the search input
+    this.menuSearch.value = '';
+    this.filterItems('');
+
+    // open the menu etc
     this.menuOpen = true;
     this.menu.style.display = 'block';
     this.menuSearch.focus();