X-Git-Url: http://git.scottworley.com/vopamoi/blobdiff_plain/246ed96550c1820ab47860314f117aaf334bc0cb..1b63569cace3349f099ea41de3bf1d19fdd9a630:/vopamoi.ts

diff --git a/vopamoi.ts b/vopamoi.ts
index 47c421d..b739747 100644
--- a/vopamoi.ts
+++ b/vopamoi.ts
@@ -310,6 +310,11 @@ enum CommitOrAbort {
   Abort,
 }
 
+interface TagFilter {
+  description: string;
+  include: (task: Element) => boolean;
+}
+
 function BrowserUI() {
   const viewColors: { [key: string]: string } = {
     all: "Gold",
@@ -320,7 +325,7 @@ function BrowserUI() {
     todo: "White",
     waiting: "MediumOrchid",
   };
-  var currentTagView: string | null = null;
+  var currentTagFilter: TagFilter | null = null;
   var currentViewState = "todo";
   var taskFocusedBeforeJumpingToInput: HTMLElement | null = null;
   var lastTagNameEntered = "";
@@ -561,7 +566,7 @@ function BrowserUI() {
     },
 
     resetTagView: function () {
-      currentTagView = null;
+      currentTagFilter = null;
       this.setTitle();
       const taskList = document.getElementById("tasks")!;
       for (const task of Array.from(document.getElementsByClassName("task"))) {
@@ -611,20 +616,14 @@ function BrowserUI() {
       return ui.setState(createTimestamp, newState, oldState);
     },
 
-    setTagView: function (tag: string | null = null) {
-      if (tag === null) {
-        const target = this.currentTag();
-        if (!target) return;
-        tag = target.textContent!;
-      }
-
-      if (currentTagView !== null) {
+    setTagFilter: function (filter: TagFilter) {
+      if (currentTagFilter !== null) {
         this.resetTagView();
       }
 
       const tasksWithTag = new Map();
       for (const task of document.getElementsByClassName("task")) {
-        if (model.hasTag(task, tag)) {
+        if (filter.include(task)) {
           tasksWithTag.set(task.getElementsByClassName("desc")[0].textContent, [model.getPriority(task), task]);
         }
       }
@@ -643,7 +642,7 @@ function BrowserUI() {
       }
 
       for (const task of Array.from(document.getElementsByClassName("task"))) {
-        if (model.hasTag(task, tag)) {
+        if (filter.include(task)) {
           task.classList.remove("hide");
         } else {
           const superTask = highestPrioritySuperTask(task);
@@ -655,12 +654,21 @@ function BrowserUI() {
         }
       }
 
-      currentTagView = tag;
+      currentTagFilter = filter;
       this.setTitle();
     },
 
+    setTagView: function (tag: string | null = null) {
+      if (tag === null) {
+        const target = this.currentTag();
+        if (!target) return;
+        tag = target.textContent!;
+      }
+      this.setTagFilter({description: tag, include: task => !!model.hasTag(task, tag!)});
+    },
+
     setTitle: function () {
-      document.title = "Vopamoi: " + currentViewState + (currentTagView ? ": " + currentTagView : "");
+      document.title = "Vopamoi: " + currentViewState + (currentTagFilter ? ": " + currentTagFilter.description : "");
     },
 
     setView: function (state: string) {
@@ -681,16 +689,7 @@ function BrowserUI() {
     },
 
     setUntaggedView: function () {
-      if (currentTagView !== null) {
-        this.resetTagView();
-      }
-      for (const task of document.getElementsByClassName("task")) {
-        if (task.getElementsByClassName("tag").length === 0) {
-          task.classList.remove("hide");
-        } else {
-          task.classList.add("hide");
-        }
-      }
+      this.setTagFilter({description: "(untagged)", include: task => task.getElementsByClassName("tag").length === 0});
     },
 
     undo: function () {
@@ -750,7 +749,7 @@ function handleKey(event: any) {
           if (event.key == "G") return browserUI.jumpCursor(inputCount ?? MAX_SAFE_INTEGER);
           if (event.key == "T") return browserUI.makeTopPriority();
           if (event.key == "n") return browserUI.focusTaskNameInput(event);
-          if (event.key == "c") return browserUI.setState("cancelled");
+          if (event.key == "C") return browserUI.setState("cancelled");
           if (event.key == "d") return browserUI.setState("done");
           if (event.key == "q") return browserUI.setState("todo");
           if (event.key == "s") return (inputState = InputState.S);
@@ -773,8 +772,11 @@ function handleKey(event: any) {
     } else if (inputState === InputState.V) {
       inputState = InputState.Root;
       if (event.key == "a") return browserUI.setView("all");
-      if (event.key == "c") return browserUI.setView("cancelled");
+      if (event.key == "C") return browserUI.setView("cancelled");
+      if (event.key == "c") return browserUI.setTagView("comp");
       if (event.key == "d") return browserUI.setView("done");
+      if (event.key == "e") return browserUI.setTagView("errand");
+      if (event.key == "h") return browserUI.setTagView("home");
       if (event.key == "i") return browserUI.setUntaggedView();
       if (event.key == "p") return browserUI.setTagView("Project");
       if (event.key == "q") return browserUI.setView("todo");
@@ -785,6 +787,7 @@ function handleKey(event: any) {
       if (event.key == "v") return browserUI.resetView();
       if (event.key == "w") return browserUI.setView("waiting");
       if (event.key == "x") return browserUI.setView("deleted");
+      if (event.key == "z") return browserUI.setTagView("zombie");
     } else if (inputState === InputState.VS) {
       inputState = InputState.Root;
       if (event.key == "m") return browserUI.setView("someday-maybe");