X-Git-Url: http://git.scottworley.com/vopamoi/blobdiff_plain/b56a37d31873fa82e6196cde9479b689a14e4629..3a731557d09232dbf6871a33cff2cbeda42db880:/vopamoi.ts

diff --git a/vopamoi.ts b/vopamoi.ts
index a3b7824..01e761c 100644
--- a/vopamoi.ts
+++ b/vopamoi.ts
@@ -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.
@@ -149,7 +148,6 @@ function Log(prefix: string = "vp-") {
 }
 const log = Log();
 
-
 function UI() {
   const undoLog: string[] = [];
   return {
@@ -179,14 +177,25 @@ function UI() {
 }
 const ui = UI();
 
+enum CommitOrAbort {
+  Commit,
+  Abort,
+}
+
 function BrowserUI() {
   var currentViewState = "todo";
+  var taskFocusedBeforeJumpingToInput: HTMLElement | null = null;
   return {
     addTask: function (event: KeyboardEvent) {
       const input = <HTMLInputElement>document.getElementById("taskName");
       if (input.value) {
         const task = ui.addTask(input.value);
-        if (task && task instanceof HTMLElement) task.focus();
+        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]);
@@ -205,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")!;
@@ -218,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);
@@ -234,6 +242,9 @@ function BrowserUI() {
     },
 
     focusTaskNameInput: function (event: Event) {
+      if (document.activeElement instanceof HTMLElement) {
+        taskFocusedBeforeJumpingToInput = document.activeElement;
+      }
       document.getElementById("taskName")!.focus();
       event.preventDefault();
     },
@@ -279,6 +290,14 @@ function BrowserUI() {
       }
     },
 
+    returnFocusAfterInput: function (): boolean {
+      if (taskFocusedBeforeJumpingToInput) {
+        taskFocusedBeforeJumpingToInput.focus();
+        return true;
+      }
+      return false;
+    },
+
     // Change task's priority to be between other tasks a and b.
     setPriority: function (task: Element, a: Element | null, b: Element | null) {
       const aPriority = a === null ? 0 : Model.getPriority(a);
@@ -331,8 +350,10 @@ function handleKey(event: any) {
   if (event.target.tagName === "INPUT") {
     if (event.target.id === "taskName") {
       if (event.key == "Enter") return browserUI.addTask(event);
+      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) {