X-Git-Url: http://git.scottworley.com/vopamoi/blobdiff_plain/e1eb33ad260e5da0ec6859baa2368d8a08538e11..09cd65ad6907a157c1907c6b30325e31128e0267:/vopamoi.ts

diff --git a/vopamoi.ts b/vopamoi.ts
index 7c51935..a6f85f2 100644
--- a/vopamoi.ts
+++ b/vopamoi.ts
@@ -44,6 +44,8 @@ const Model = {
   addTag: function (createTimestamp: string, tagName: string): Element | null {
     const task = this.getTask(createTimestamp);
     if (!task) return null;
+    const existingTag = this.hasTag(task, tagName);
+    if (existingTag) return existingTag;
     const tag = document.createElement("span");
     tag.appendChild(document.createTextNode(tagName));
     tag.classList.add("tag");
@@ -77,13 +79,13 @@ const Model = {
     return target;
   },
 
-  hasTag: function (task: Element, tag: string) {
+  hasTag: function (task: Element, tag: string): Element | null {
     for (const child of task.children) {
       if (child.classList.contains("tag") && child.textContent === tag) {
-        return true;
+        return child;
       }
     }
-    return false;
+    return null;
   },
 
   getPriority: function (task: Element): number {
@@ -213,6 +215,7 @@ enum CommitOrAbort {
 function BrowserUI() {
   var currentViewState = "todo";
   var taskFocusedBeforeJumpingToInput: HTMLElement | null = null;
+  var lastTagNameEntered = "";
   return {
     addTask: function (event: KeyboardEvent) {
       const input = <HTMLInputElement>document.getElementById("taskName");
@@ -251,8 +254,10 @@ function BrowserUI() {
       const input = document.createElement("input");
       input.classList.add("tag");
       input.addEventListener("blur", this.completeTagEdit, { once: true });
+      input.value = lastTagNameEntered;
       task.appendChild(input);
       input.focus();
+      input.select();
       event.preventDefault();
     },
 
@@ -281,6 +286,7 @@ function BrowserUI() {
       task.focus();
       if (!Model.hasTag(task, newTagName)) {
         ui.addTag(task.getAttribute("data-created")!, newTagName);
+        lastTagNameEntered = newTagName;
       }
     },