Press "x" to remove tags

[vopamoi] / vopamoi.ts

diff --git a/vopamoi.ts b/vopamoi.ts
index 6519cbfc4367a1f2290a5598b07f9f001d9a87c4..17d81b65150ced2b9bcdbf38d47af914a93d5656 100644 (file)
--- a/vopamoi.ts
+++ b/vopamoi.ts
@@ -119,6 +119,15 @@ const Model = {
     }
   },
 
     }
   },
 

+  removeTag: function (createTimestamp: string, tagName: string) {
+    const task = this.getTask(createTimestamp);
+    if (!task) return null;
+    const tag = this.hasTag(task, tagName);
+    if (!tag) return;
+    task.removeChild(tag);
+    if (task instanceof HTMLElement) task.focus();
+  },
+

   setPriority: function (createTimestamp: string, priority: number): Element | null {
     const target = this.getTask(createTimestamp);
     if (!target) return null;
   setPriority: function (createTimestamp: string, priority: number): Element | null {
     const target = this.getTask(createTimestamp);
     if (!target) return null;


@@ -165,6 +174,10 @@ function Log(prefix: string = "vp-") {
         const [createTimestamp, tag] = splitN(data, " ", 1);
         return Model.addTag(createTimestamp, tag);
       }
         const [createTimestamp, tag] = splitN(data, " ", 1);
         return Model.addTag(createTimestamp, tag);
       }

+      if (command == "Untag") {
+        const [createTimestamp, tag] = splitN(data, " ", 1);
+        return Model.removeTag(createTimestamp, tag);
+      }

     },
 
     record: function (entry: string) {
     },
 
     record: function (entry: string) {


@@ -199,13 +212,17 @@ function UI() {
       return <Element>log.recordAndApply(`${now} Create ${description}`);
     },
     addTag: function (createTimestamp: string, tag: string) {
       return <Element>log.recordAndApply(`${now} Create ${description}`);
     },
     addTag: function (createTimestamp: string, tag: string) {

-      // TODO: undo
+      undoLog.push(`Untag ${createTimestamp} ${tag}`);

       return log.recordAndApply(`${clock.now()} Tag ${createTimestamp} ${tag}`);
     },
     edit: function (createTimestamp: string, newDescription: string, oldDescription: string) {
       undoLog.push(`Edit ${createTimestamp} ${oldDescription}`);
       return log.recordAndApply(`${clock.now()} Edit ${createTimestamp} ${newDescription}`);
     },
       return log.recordAndApply(`${clock.now()} Tag ${createTimestamp} ${tag}`);
     },
     edit: function (createTimestamp: string, newDescription: string, oldDescription: string) {
       undoLog.push(`Edit ${createTimestamp} ${oldDescription}`);
       return log.recordAndApply(`${clock.now()} Edit ${createTimestamp} ${newDescription}`);
     },

+    removeTag: function (createTimestamp: string, tag: string) {
+      undoLog.push(`Tag ${createTimestamp} ${tag}`);
+      return log.recordAndApply(`${clock.now()} Untag ${createTimestamp} ${tag}`);
+    },

     setPriority: function (createTimestamp: string, newPriority: number, oldPriority: number) {
       undoLog.push(`Priority ${createTimestamp} ${oldPriority}`);
       return log.recordAndApply(`${clock.now()} Priority ${createTimestamp} ${newPriority}`);
     setPriority: function (createTimestamp: string, newPriority: number, oldPriority: number) {
       undoLog.push(`Priority ${createTimestamp} ${oldPriority}`);
       return log.recordAndApply(`${clock.now()} Priority ${createTimestamp} ${newPriority}`);


@@ -364,6 +381,12 @@ function BrowserUI() {
       }
     },
 
       }
     },
 

+    removeTag: function () {
+      const tag = document.activeElement;
+      if (!tag || !tag.classList.contains("tag")) return;
+      ui.removeTag(tag.parentElement!.getAttribute("data-created")!, tag.textContent!);
+    },
+

     returnFocusAfterInput: function (): boolean {
       if (taskFocusedBeforeJumpingToInput) {
         taskFocusedBeforeJumpingToInput.focus();
     returnFocusAfterInput: function (): boolean {
       if (taskFocusedBeforeJumpingToInput) {
         taskFocusedBeforeJumpingToInput.focus();


@@ -447,6 +470,7 @@ function handleKey(event: any) {
       if (event.key == "s") return browserUI.setState("someday-maybe");
       if (event.key == "w") return browserUI.setState("waiting");
       if (event.key == "X") return browserUI.setState("deleted");
       if (event.key == "s") return browserUI.setState("someday-maybe");
       if (event.key == "w") return browserUI.setState("waiting");
       if (event.key == "X") return browserUI.setState("deleted");

+      if (event.key == "x") return browserUI.removeTag();

       if (event.key == "u") return browserUI.undo();
       if (event.key == "e") return browserUI.beginEdit(event);
       if (event.key == "t") return browserUI.beginTagEdit(event);
       if (event.key == "u") return browserUI.undo();
       if (event.key == "e") return browserUI.beginEdit(event);
       if (event.key == "t") return browserUI.beginTagEdit(event);


@@ -457,6 +481,7 @@ function handleKey(event: any) {
       if (event.key == "d") return browserUI.setView("done", "LawnGreen");
       if (event.key == "q") return browserUI.setView("todo", "White");
       if (event.key == "s") return browserUI.setView("someday-maybe", "DeepSkyBlue");
       if (event.key == "d") return browserUI.setView("done", "LawnGreen");
       if (event.key == "q") return browserUI.setView("todo", "White");
       if (event.key == "s") return browserUI.setView("someday-maybe", "DeepSkyBlue");

+      if (event.key == "v") return browserUI.setView("todo", "White");

       if (event.key == "w") return browserUI.setView("waiting", "MediumOrchid");
       if (event.key == "x") return browserUI.setView("deleted", "Black");
     }
       if (event.key == "w") return browserUI.setView("waiting", "MediumOrchid");
       if (event.key == "x") return browserUI.setView("deleted", "Black");
     }