Never mind about Destroy. Deleting is just state "deleted"

[vopamoi] / vopamoi.ts

diff --git a/vopamoi.ts b/vopamoi.ts
index fe3d491630f9e5781bdc7ba62f2f6ee0ad731b7e..5e645b8f0fb4a849d943b0abbde9537b97475b6d 100644 (file)
--- a/vopamoi.ts
+++ b/vopamoi.ts
@@ -14,7 +14,7 @@ function splitN(str: string, delimiter: string, limit: number = MAX_SAFE_INTEGER
 }
 
 const Model = {
-  addTask: function (timestamp: string, description: string) {
+  addTask: function (timestamp: string, description: string): Element {
     const task = document.createElement("div");
     task.appendChild(document.createTextNode(description));
     task.setAttribute("class", "task");
@@ -22,13 +22,7 @@ const Model = {
     task.setAttribute("data-created", timestamp);
     document.getElementById("tasks")!.appendChild(task);
     task.focus();
-  },
-
-  destroyTask: function (createTimestamp: string) {
-    const task = this.getTask(createTimestamp);
-    if (task) {
-      task.parentElement!.removeChild(task);
-    }
+    return task;
   },
 
   getPriority: function (task: Element): number {
@@ -78,18 +72,15 @@ function Log(prefix: string = "vp-") {
     apply: function (entry: string) {
       const [timestamp, command, data] = splitN(entry, " ", 2);
       if (command == "Create") {
-        Model.addTask(timestamp, data);
-      }
-      if (command == "Destroy") {
-        Model.destroyTask(data.split(" ", 1)[0]);
+        return Model.addTask(timestamp, data);
       }
       if (command == "State") {
         const [createTimestamp, state] = splitN(data, " ", 1);
-        Model.setState(timestamp, createTimestamp, state);
+        return Model.setState(timestamp, createTimestamp, state);
       }
       if (command == "Priority") {
         const [createTimestamp, newPriority] = splitN(data, " ", 1);
-        Model.setPriority(createTimestamp, parseFloat(newPriority));
+        return Model.setPriority(createTimestamp, parseFloat(newPriority));
       }
     },
 
@@ -99,7 +90,7 @@ function Log(prefix: string = "vp-") {
 
     recordAndApply: function (entry: string) {
       this.record(entry);
-      this.apply(entry);
+      return this.apply(entry);
     },
 
     replay: function () {
@@ -117,36 +108,38 @@ function Log(prefix: string = "vp-") {
 const log = Log();
 
 const UI = {
-  addTask: function (description: string) {
-    log.recordAndApply(`${Date.now()} Create ${description}`);
-  },
-  destroyTask: function (createTimestamp: string) {
-    log.recordAndApply(`${Date.now()} Destroy ${createTimestamp} ${Model.getTask(createTimestamp)?.textContent}`);
+  addTask: function (description: string): Element {
+    return <Element>log.recordAndApply(`${Date.now()} Create ${description}`);
   },
   setPriority: function (createTimestamp: string, priority: number) {
-    log.recordAndApply(`${Date.now()} Priority ${createTimestamp} ${priority}`);
+    return log.recordAndApply(`${Date.now()} Priority ${createTimestamp} ${priority}`);
   },
   setState: function (createTimestamp: string, state: string) {
-    log.recordAndApply(`${Date.now()} State ${createTimestamp} ${state}`);
+    return log.recordAndApply(`${Date.now()} State ${createTimestamp} ${state}`);
   },
 };
 
 const BrowserUI = {
-  addTask: function () {
+  addTask: function (event: KeyboardEvent) {
     const input = <HTMLInputElement>document.getElementById("taskName");
     if (input.value) {
-      UI.addTask(input.value);
+      const task = UI.addTask(input.value);
       input.value = "";
+      if (event.getModifierState("Control")) {
+        this.setPriority(task, null, document.getElementsByClassName("task")[0]);
+      }
     }
   },
 
-  destroyTask: function () {
-    const createTimestamp = document.activeElement?.getAttribute("data-created");
-    this.moveCursor(1) || this.moveCursor(-1);
-    return UI.destroyTask(createTimestamp!);
+  firstVisibleTask: function () {
+    for (const task of document.getElementsByClassName("task")) {
+      if (task instanceof HTMLElement && task.style.display !== "none") {
+        return task;
+      }
+    }
   },
 
-  focusTaskNameInput: function (event: any) {
+  focusTaskNameInput: function (event: Event) {
     document.getElementById("taskName")!.focus();
     event.preventDefault();
   },
@@ -214,7 +207,7 @@ const BrowserUI = {
 
 function handleKey(event: any) {
   if (event.target.tagName === "INPUT") {
-    if (event.key == "Enter") return BrowserUI.addTask();
+    if (event.key == "Enter") return BrowserUI.addTask(event);
   } else {
     if (event.key == "j") return BrowserUI.moveCursor(1);
     if (event.key == "k") return BrowserUI.moveCursor(-1);
@@ -225,11 +218,12 @@ function handleKey(event: any) {
     if (event.key == "w") return BrowserUI.setState("waiting");
     if (event.key == "d") return BrowserUI.setState("done");
     if (event.key == "c") return BrowserUI.setState("cancelled");
-    if (event.key == "X") return BrowserUI.destroyTask();
+    if (event.key == "X") return BrowserUI.setState("deleted");
   }
 }
 
 function browserInit() {
   document.body.addEventListener("keydown", handleKey, { capture: false });
   log.replay();
+  BrowserUI.firstVisibleTask()?.focus();
 }