Rename inputStates to be less semantic and more concrete

[vopamoi] / vopamoi.ts

diff --git a/vopamoi.ts b/vopamoi.ts
index 17d81b65150ced2b9bcdbf38d47af914a93d5656..50b25fa945c251467f5ad5b62be31a43c44a81d5 100644 (file)
--- a/vopamoi.ts
+++ b/vopamoi.ts
@@ -262,7 +262,7 @@ function BrowserUI() {
       }
       input.value = "";
       if (event.getModifierState("Control")) {
       }
       input.value = "";
       if (event.getModifierState("Control")) {

-        this.setPriority(task, null, document.getElementsByClassName("task")[0]);
+        this.makeTopPriority(task);

       }
     },
 
       }
     },
 


@@ -356,6 +356,12 @@ function BrowserUI() {
       return valid_cursor;
     },
 
       return valid_cursor;
     },
 

+    makeTopPriority: function (task: Element | null = null) {
+      if (!task) task = document.activeElement;
+      if (!task) return;
+      this.setPriority(task, null, document.getElementsByClassName("task")[0]);
+    },
+

     moveCursor: function (offset: number): boolean {
       const active = document.activeElement;
       if (!active) return false;
     moveCursor: function (offset: number): boolean {
       const active = document.activeElement;
       if (!active) return false;


@@ -382,9 +388,14 @@ function BrowserUI() {
     },
 
     removeTag: function () {
     },
 
     removeTag: function () {

-      const tag = document.activeElement;
-      if (!tag || !tag.classList.contains("tag")) return;
-      ui.removeTag(tag.parentElement!.getAttribute("data-created")!, tag.textContent!);
+      var target = document.activeElement;
+      if (!target) return;
+      if (target.classList.contains("task")) {
+        const tags = target.getElementsByClassName("tag");
+        target = tags[tags.length - 1];
+      }
+      if (!target || !target.classList.contains("tag")) return;
+      ui.removeTag(target.parentElement!.getAttribute("data-created")!, target.textContent!);

     },
 
     returnFocusAfterInput: function (): boolean {
     },
 
     returnFocusAfterInput: function (): boolean {


@@ -440,10 +451,10 @@ function BrowserUI() {
 const browserUI = BrowserUI();
 
 enum InputState {
 const browserUI = BrowserUI();
 
 enum InputState {

-  Command,
-  View,
+  Root,
+  V,

 }
 }

-var inputState = InputState.Command;
+var inputState = InputState.Root;

 
 function handleKey(event: any) {
   if (event.target.tagName === "INPUT") {
 
 function handleKey(event: any) {
   if (event.target.tagName === "INPUT") {


@@ -458,11 +469,12 @@ function handleKey(event: any) {
       if (event.key == "Escape") return browserUI.completeEdit(event, CommitOrAbort.Abort);
     }
   } else {
       if (event.key == "Escape") return browserUI.completeEdit(event, CommitOrAbort.Abort);
     }
   } else {

-    if (inputState === InputState.Command) {
+    if (inputState === InputState.Root) {

       if (event.key == "j") return browserUI.moveCursor(1);
       if (event.key == "k") return browserUI.moveCursor(-1);
       if (event.key == "J") return browserUI.moveTask(1);
       if (event.key == "K") return browserUI.moveTask(-1);
       if (event.key == "j") return browserUI.moveCursor(1);
       if (event.key == "k") return browserUI.moveCursor(-1);
       if (event.key == "J") return browserUI.moveTask(1);
       if (event.key == "K") return browserUI.moveTask(-1);

+      if (event.key == "T") return browserUI.makeTopPriority();

       if (event.key == "n") return browserUI.focusTaskNameInput(event);
       if (event.key == "c") return browserUI.setState("cancelled");
       if (event.key == "d") return browserUI.setState("done");
       if (event.key == "n") return browserUI.focusTaskNameInput(event);
       if (event.key == "c") return browserUI.setState("cancelled");
       if (event.key == "d") return browserUI.setState("done");


@@ -474,9 +486,9 @@ function handleKey(event: any) {
       if (event.key == "u") return browserUI.undo();
       if (event.key == "e") return browserUI.beginEdit(event);
       if (event.key == "t") return browserUI.beginTagEdit(event);
       if (event.key == "u") return browserUI.undo();
       if (event.key == "e") return browserUI.beginEdit(event);
       if (event.key == "t") return browserUI.beginTagEdit(event);

-      if (event.key == "v") return (inputState = InputState.View);
-    } else if (inputState === InputState.View) {
-      inputState = InputState.Command;
+      if (event.key == "v") return (inputState = InputState.V);
+    } else if (inputState === InputState.V) {
+      inputState = InputState.Root;

       if (event.key == "c") return browserUI.setView("cancelled", "Red");
       if (event.key == "d") return browserUI.setView("done", "LawnGreen");
       if (event.key == "q") return browserUI.setView("todo", "White");
       if (event.key == "c") return browserUI.setView("cancelled", "Red");
       if (event.key == "d") return browserUI.setView("done", "LawnGreen");
       if (event.key == "q") return browserUI.setView("todo", "White");