X-Git-Url: http://git.scottworley.com/vopamoi/blobdiff_plain/4c532769ab489589eeb7ece02dbbc798d13c47f2..0726872b8e043c19883d26492ce42d3411505179:/vopamoi.ts

diff --git a/vopamoi.ts b/vopamoi.ts
index e99777c..c17a2f0 100644
--- a/vopamoi.ts
+++ b/vopamoi.ts
@@ -119,6 +119,14 @@ const Model = {
     }
   },
 
+  removeTag: function (createTimestamp: string, tagName: string) {
+    const task = this.getTask(createTimestamp);
+    if (!task) return null;
+    const tag = this.hasTag(task, tagName);
+    if (!tag) return;
+    task.removeChild(tag);
+  },
+
   setPriority: function (createTimestamp: string, priority: number): Element | null {
     const target = this.getTask(createTimestamp);
     if (!target) return null;
@@ -165,6 +173,10 @@ function Log(prefix: string = "vp-") {
         const [createTimestamp, tag] = splitN(data, " ", 1);
         return Model.addTag(createTimestamp, tag);
       }
+      if (command == "Untag") {
+        const [createTimestamp, tag] = splitN(data, " ", 1);
+        return Model.removeTag(createTimestamp, tag);
+      }
     },
 
     record: function (entry: string) {
@@ -199,7 +211,7 @@ function UI() {
       return <Element>log.recordAndApply(`${now} Create ${description}`);
     },
     addTag: function (createTimestamp: string, tag: string) {
-      // TODO: undo
+      undoLog.push(`Untag ${createTimestamp} ${tag}`);
       return log.recordAndApply(`${clock.now()} Tag ${createTimestamp} ${tag}`);
     },
     edit: function (createTimestamp: string, newDescription: string, oldDescription: string) {
@@ -235,18 +247,17 @@ function BrowserUI() {
   return {
     addTask: function (event: KeyboardEvent) {
       const input = <HTMLInputElement>document.getElementById("taskName");
-      if (input.value) {
-        const task = ui.addTask(input.value);
-        if (currentViewState === "todo") {
-          task instanceof HTMLElement && task.focus();
-        } else if (this.returnFocusAfterInput()) {
-        } else {
-          this.firstVisibleTask()?.focus();
-        }
-        input.value = "";
-        if (event.getModifierState("Control")) {
-          this.setPriority(task, null, document.getElementsByClassName("task")[0]);
-        }
+      if (input.value.match(/^ *$/)) return;
+      const task = ui.addTask(input.value);
+      if (currentViewState === "todo") {
+        task instanceof HTMLElement && task.focus();
+      } else if (this.returnFocusAfterInput()) {
+      } else {
+        this.firstVisibleTask()?.focus();
+      }
+      input.value = "";
+      if (event.getModifierState("Control")) {
+        this.setPriority(task, null, document.getElementsByClassName("task")[0]);
       }
     },
 
@@ -288,7 +299,7 @@ function BrowserUI() {
       task.removeChild(input);
       task.removeAttribute("data-description");
       task.focus();
-      if (newDescription === oldDescription || resolution === CommitOrAbort.Abort) {
+      if (resolution === CommitOrAbort.Abort || newDescription.match(/^ *$/) || newDescription === oldDescription) {
         desc.textContent = oldDescription;
       } else {
         ui.edit(task.getAttribute("data-created")!, newDescription, oldDescription);
@@ -302,7 +313,7 @@ function BrowserUI() {
       input.removeEventListener("blur", this.completeTagEdit);
       task.removeChild(input);
       task.focus();
-      if (resolution === CommitOrAbort.Commit && newTagName && !Model.hasTag(task, newTagName)) {
+      if (resolution === CommitOrAbort.Commit && !newTagName.match(/^ *$/) && !Model.hasTag(task, newTagName)) {
         ui.addTag(task.getAttribute("data-created")!, newTagName);
         lastTagNameEntered = newTagName;
       }
@@ -458,6 +469,7 @@ function handleKey(event: any) {
       if (event.key == "d") return browserUI.setView("done", "LawnGreen");
       if (event.key == "q") return browserUI.setView("todo", "White");
       if (event.key == "s") return browserUI.setView("someday-maybe", "DeepSkyBlue");
+      if (event.key == "v") return browserUI.setView("todo", "White");
       if (event.key == "w") return browserUI.setView("waiting", "MediumOrchid");
       if (event.key == "x") return browserUI.setView("deleted", "Black");
     }
@@ -465,7 +477,7 @@ function handleKey(event: any) {
 }
 
 function browserInit() {
-  document.body.addEventListener("keydown", handleKey, { capture: false });
   log.replay();
   browserUI.firstVisibleTask()?.focus();
+  document.body.addEventListener("keydown", handleKey, { capture: false });
 }