Mostly ignore inputs when control is pressed

[vopamoi] / vopamoi.ts

diff --git a/vopamoi.ts b/vopamoi.ts
index 3ccc5625e085fa44e6cde1fb2daef9cc515fd37f..9137ff55b60ff26c142e317f17de247e9deb01c7 100644 (file)
--- a/vopamoi.ts
+++ b/vopamoi.ts
@@ -378,6 +378,13 @@ function BrowserUI() {
       return valid_cursor;
     },
 
+    jumpCursor: function (position: number) {
+      const first = this.firstVisibleTask();
+      if (!first) return;
+      const dest = this.visibleTaskAtOffset(first, position - 1);
+      if (dest instanceof HTMLElement) dest.focus();
+    },
+
     makeTopPriority: function (task: Element | null = null) {
       if (!task) task = document.activeElement;
       if (!task) return;
@@ -492,6 +499,7 @@ var inputState = InputState.Root;
 var inputCount: number | null = null;
 
 function handleKey(event: any) {
+  if (["Alt", "Control", "Meta", "Shift"].includes(event.key)) return;
   if (event.target.tagName === "INPUT") {
     if (event.target.id === "taskName") {
       if (event.key == "Enter") return browserUI.addTask(event);
@@ -504,6 +512,7 @@ function handleKey(event: any) {
       if (event.key == "Escape") return browserUI.completeEdit(event, CommitOrAbort.Abort);
     }
   } else {
+    if (event.ctrlKey) return; // eg: Don't redo when user refreshes the page with ctrl-R
     if (inputState === InputState.Root) {
       if ("0" <= event.key && event.key <= "9") {
         return (inputCount = (inputCount ?? 0) * 10 + parseInt(event.key));
@@ -511,8 +520,9 @@ function handleKey(event: any) {
       try {
         if (event.key == "j") return browserUI.moveCursor(inputCount ?? 1);
         if (event.key == "k") return browserUI.moveCursor(-(inputCount ?? 1));
-        if (event.key == "J") return browserUI.moveTask(1);
-        if (event.key == "K") return browserUI.moveTask(-1);
+        if (event.key == "J") return browserUI.moveTask(inputCount ?? 1);
+        if (event.key == "K") return browserUI.moveTask(-(inputCount ?? 1));
+        if (event.key == "G") return browserUI.jumpCursor(inputCount ?? MAX_SAFE_INTEGER);
         if (event.key == "T") return browserUI.makeTopPriority();
         if (event.key == "n") return browserUI.focusTaskNameInput(event);
         if (event.key == "c") return browserUI.setState("cancelled");