Use classList to set class

[vopamoi] / vopamoi.ts

diff --git a/vopamoi.ts b/vopamoi.ts
index fdc47235fb62091978f809f06bf67d88b1f07bf8..c079bd465ec3dd8dd3e52843b3d1d2749ec046dc 100644 (file)
--- a/vopamoi.ts
+++ b/vopamoi.ts
@@ -33,7 +33,7 @@ const Model = {
   addTask: function (timestamp: string, description: string): Element {
     const task = document.createElement("div");
     task.appendChild(document.createTextNode(description));
-    task.setAttribute("class", "task");
+    task.classList.add("task");
     task.setAttribute("tabindex", "0");
     task.setAttribute("data-created", timestamp);
     task.setAttribute("data-state", "todo");
@@ -49,12 +49,11 @@ const Model = {
       const input = target.children[0] as HTMLInputElement;
       if (
         input.value === target.getAttribute("data-description") &&
-        input.selectionStart === 0 &&
+        input.selectionStart === input.value.length &&
         input.selectionEnd === input.value.length
       ) {
         // No local changes have actually been made yet.  Change the contents of the edit box!
         input.value = newDescription;
-        input.select();
       } else {
         // No great options.
         // Prefer not to interrupt the local user's edit.
@@ -178,6 +177,11 @@ function UI() {
 }
 const ui = UI();
 
+enum CommitOrAbort {
+  Commit,
+  Abort,
+}
+
 function BrowserUI() {
   var currentViewState = "todo";
   var taskFocusedBeforeJumpingToInput: HTMLElement | null = null;
@@ -210,11 +214,10 @@ function BrowserUI() {
       task.textContent = "";
       task.appendChild(input);
       input.focus();
-      input.select();
       event.preventDefault();
     },
 
-    completeEdit: function (event: Event) {
+    completeEdit: function (event: Event, resolution: CommitOrAbort = CommitOrAbort.Commit) {
       const input = event.target as HTMLInputElement;
       const task = input.parentElement!;
       const oldDescription = task.getAttribute("data-description")!;
@@ -223,7 +226,7 @@ function BrowserUI() {
       task.removeChild(task.children[0]);
       task.removeAttribute("data-description");
       task.focus();
-      if (newDescription === oldDescription) {
+      if (newDescription === oldDescription || resolution === CommitOrAbort.Abort) {
         task.textContent = oldDescription;
       } else {
         ui.edit(task.getAttribute("data-created")!, newDescription, oldDescription);
@@ -350,6 +353,7 @@ function handleKey(event: any) {
       if (event.key == "Escape") return browserUI.returnFocusAfterInput();
     } else {
       if (event.key == "Enter") return browserUI.completeEdit(event);
+      if (event.key == "Escape") return browserUI.completeEdit(event, CommitOrAbort.Abort);
     }
   } else {
     if (inputState === InputState.Command) {
@@ -360,8 +364,8 @@ function handleKey(event: any) {
       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 == "q") return browserUI.setState("todo");
       if (event.key == "s") return browserUI.setState("someday-maybe");
-      if (event.key == "t") return browserUI.setState("todo");
       if (event.key == "w") return browserUI.setState("waiting");
       if (event.key == "X") return browserUI.setState("deleted");
       if (event.key == "u") return browserUI.undo();
@@ -371,8 +375,8 @@ function handleKey(event: any) {
       inputState = InputState.Command;
       if (event.key == "c") return browserUI.setView("cancelled");
       if (event.key == "d") return browserUI.setView("done");
+      if (event.key == "q") return browserUI.setView("todo");
       if (event.key == "s") return browserUI.setView("someday-maybe");
-      if (event.key == "t") return browserUI.setView("todo");
       if (event.key == "w") return browserUI.setView("waiting");
       if (event.key == "x") return browserUI.setView("deleted");
     }