X-Git-Url: http://git.scottworley.com/vopamoi/blobdiff_plain/68a72fde2851bd9c176b8862708b71707c1d3ea1..65a7510df0f96d4168aa33b3b3be9c6f16b2160c:/vopamoi.ts?ds=sidebyside

diff --git a/vopamoi.ts b/vopamoi.ts
index b899c71..7497e54 100644
--- a/vopamoi.ts
+++ b/vopamoi.ts
@@ -14,16 +14,14 @@ function splitN(str: string, delimiter: string, limit: number = MAX_SAFE_INTEGER
 }
 
 const Model = {
-  addTask: function (timestamp: string, description: string) {
-    document.getElementById("tasks")!.appendChild(this.createTask(timestamp, description)).focus();
-  },
-
-  createTask: 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");
     task.setAttribute("tabindex", "0");
     task.setAttribute("data-created", timestamp);
+    document.getElementById("tasks")!.appendChild(task);
+    task.focus();
     return task;
   },
 
@@ -81,18 +79,18 @@ function Log(prefix: string = "vp-") {
     apply: function (entry: string) {
       const [timestamp, command, data] = splitN(entry, " ", 2);
       if (command == "Create") {
-        Model.addTask(timestamp, data);
+        return Model.addTask(timestamp, data);
       }
       if (command == "Destroy") {
-        Model.destroyTask(data.split(" ", 1)[0]);
+        return Model.destroyTask(data.split(" ", 1)[0]);
       }
       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));
       }
     },
 
@@ -102,7 +100,7 @@ function Log(prefix: string = "vp-") {
 
     recordAndApply: function (entry: string) {
       this.record(entry);
-      this.apply(entry);
+      return this.apply(entry);
     },
 
     replay: function () {
@@ -120,36 +118,41 @@ function Log(prefix: string = "vp-") {
 const log = Log();
 
 const UI = {
-  addTask: function (description: string) {
-    log.recordAndApply(`${Date.now()} Create ${description}`);
+  addTask: function (description: string): Element {
+    return <Element>log.recordAndApply(`${Date.now()} Create ${description}`);
   },
   destroyTask: function (createTimestamp: string) {
-    log.recordAndApply(`${Date.now()} Destroy ${createTimestamp} ${Model.getTask(createTimestamp)?.textContent}`);
+    return log.recordAndApply(`${Date.now()} Destroy ${createTimestamp} ${Model.getTask(createTimestamp)?.textContent}`);
   },
   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 (form: any) {
-    if (form.taskName.value) {
-      UI.addTask(form.taskName.value);
-      form.taskName.value = "";
+  addTask: function (event: KeyboardEvent) {
+    const input = <HTMLInputElement>document.getElementById("taskName");
+    if (input.value) {
+      const task = UI.addTask(input.value);
+      input.value = "";
+      if (event.getModifierState("Control")) {
+        this.setPriority(task, null, document.getElementsByClassName("task")[0]);
+      }
     }
-    return false;
   },
 
-  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();
   },
@@ -216,7 +219,9 @@ const BrowserUI = {
 };
 
 function handleKey(event: any) {
-  if (event.target.tagName !== "INPUT") {
+  if (event.target.tagName === "INPUT") {
+    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);
     if (event.key == "J") return BrowserUI.moveTask(1);
@@ -233,4 +238,5 @@ function handleKey(event: any) {
 function browserInit() {
   document.body.addEventListener("keydown", handleKey, { capture: false });
   log.replay();
+  BrowserUI.firstVisibleTask()?.focus();
 }