Disallow empty-string as a tag name

[vopamoi] / vopamoi.ts

diff --git a/vopamoi.ts b/vopamoi.ts
index 5ac82ef516854c12232026753594d8686fbc0db7..6e511a5e67c6172cdb273bc78d8e2c3b1bce04d2 100644 (file)
--- 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;
   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");
     const tag = document.createElement("span");
     tag.appendChild(document.createTextNode(tagName));
     tag.classList.add("tag");


@@ -77,6 +79,15 @@ const Model = {
     return target;
   },
 
     return target;
   },
 

+  hasTag: function (task: Element, tag: string): Element | null {
+    for (const child of task.children) {
+      if (child.classList.contains("tag") && child.textContent === tag) {
+        return child;
+      }
+    }
+    return null;
+  },
+

   getPriority: function (task: Element): number {
     if (task.hasAttribute("data-priority")) {
       return parseFloat(task.getAttribute("data-priority")!);
   getPriority: function (task: Element): number {
     if (task.hasAttribute("data-priority")) {
       return parseFloat(task.getAttribute("data-priority")!);


@@ -204,6 +215,7 @@ enum CommitOrAbort {
 function BrowserUI() {
   var currentViewState = "todo";
   var taskFocusedBeforeJumpingToInput: HTMLElement | null = null;
 function BrowserUI() {
   var currentViewState = "todo";
   var taskFocusedBeforeJumpingToInput: HTMLElement | null = null;

+  var lastTagNameEntered = "";

   return {
     addTask: function (event: KeyboardEvent) {
       const input = <HTMLInputElement>document.getElementById("taskName");
   return {
     addTask: function (event: KeyboardEvent) {
       const input = <HTMLInputElement>document.getElementById("taskName");


@@ -242,8 +254,10 @@ function BrowserUI() {
       const input = document.createElement("input");
       input.classList.add("tag");
       input.addEventListener("blur", this.completeTagEdit, { once: true });
       const input = document.createElement("input");
       input.classList.add("tag");
       input.addEventListener("blur", this.completeTagEdit, { once: true });

+      input.value = lastTagNameEntered;

       task.appendChild(input);
       input.focus();
       task.appendChild(input);
       input.focus();

+      input.select();

       event.preventDefault();
     },
 
       event.preventDefault();
     },
 


@@ -270,7 +284,10 @@ function BrowserUI() {
       input.removeEventListener("blur", this.completeTagEdit);
       task.removeChild(input);
       task.focus();
       input.removeEventListener("blur", this.completeTagEdit);
       task.removeChild(input);
       task.focus();

-      ui.addTag(task.getAttribute("data-created")!, newTagName);
+      if (newTagName && !Model.hasTag(task, newTagName)) {
+        ui.addTag(task.getAttribute("data-created")!, newTagName);
+        lastTagNameEntered = newTagName;
+      }

     },
 
     firstVisibleTask: function () {
     },
 
     firstVisibleTask: function () {