Keep description in its own span

Tags broke task.textContent being an easy way to get the task
description, which editTask was using.  This restores neatness & fixes a
bug in which tag names were slurped into the edit-task buffer.

diff --git a/vopamoi.ts b/vopamoi.ts
index cbb9af23d308527302aedc4fc40493cf297f90a0..5916d0a9b21d5fe722d5e05cfa2151b2e1057dd1 100644 (file)
--- a/vopamoi.ts
+++ b/vopamoi.ts
@@ -32,7 +32,10 @@ const clock = Clock();
 const Model = {
   addTask: function (timestamp: string, description: string): Element {
     const task = document.createElement("div");
 const Model = {
   addTask: function (timestamp: string, description: string): Element {
     const task = document.createElement("div");

-    task.appendChild(document.createTextNode(description));
+    const desc = document.createElement("span");
+    desc.textContent = description;
+    desc.classList.add("desc");
+    task.appendChild(desc);

     task.classList.add("task");
     task.setAttribute("tabindex", "0");
     task.setAttribute("data-created", timestamp);
     task.classList.add("task");
     task.setAttribute("tabindex", "0");
     task.setAttribute("data-created", timestamp);


@@ -74,7 +77,7 @@ const Model = {
         target.setAttribute("data-description", newDescription);
       }
     } else {
         target.setAttribute("data-description", newDescription);
       }
     } else {

-      target.textContent = newDescription;
+      target.getElementsByClassName("desc")[0].textContent = newDescription;

     }
     return target;
   },
     }
     return target;
   },


@@ -238,11 +241,12 @@ function BrowserUI() {
       const task = document.activeElement;
       if (!task) return;
       const input = document.createElement("input");
       const task = document.activeElement;
       if (!task) return;
       const input = document.createElement("input");

-      const oldDescription = task.textContent!;
+      const desc = task.getElementsByClassName("desc")[0];
+      const oldDescription = desc.textContent!;

       task.setAttribute("data-description", oldDescription);
       input.value = oldDescription;
       input.addEventListener("blur", this.completeEdit, { once: true });
       task.setAttribute("data-description", oldDescription);
       input.value = oldDescription;
       input.addEventListener("blur", this.completeEdit, { once: true });

-      task.textContent = "";
+      desc.textContent = "";

       task.insertBefore(input, task.firstChild);
       input.focus();
       event.preventDefault();
       task.insertBefore(input, task.firstChild);
       input.focus();
       event.preventDefault();


@@ -264,6 +268,7 @@ function BrowserUI() {
     completeEdit: function (event: Event, resolution: CommitOrAbort = CommitOrAbort.Commit) {
       const input = event.target as HTMLInputElement;
       const task = input.parentElement!;
     completeEdit: function (event: Event, resolution: CommitOrAbort = CommitOrAbort.Commit) {
       const input = event.target as HTMLInputElement;
       const task = input.parentElement!;

+      const desc = task.getElementsByClassName("desc")[0];

       const oldDescription = task.getAttribute("data-description")!;
       const newDescription = input.value;
       input.removeEventListener("blur", this.completeEdit);
       const oldDescription = task.getAttribute("data-description")!;
       const newDescription = input.value;
       input.removeEventListener("blur", this.completeEdit);


@@ -271,7 +276,7 @@ function BrowserUI() {
       task.removeAttribute("data-description");
       task.focus();
       if (newDescription === oldDescription || resolution === CommitOrAbort.Abort) {
       task.removeAttribute("data-description");
       task.focus();
       if (newDescription === oldDescription || resolution === CommitOrAbort.Abort) {

-        task.textContent = oldDescription;
+        desc.textContent = oldDescription;

       } else {
         ui.edit(task.getAttribute("data-created")!, newDescription, oldDescription);
       }
       } else {
         ui.edit(task.getAttribute("data-created")!, newDescription, oldDescription);
       }