TagFilter type

diff --git a/vopamoi.ts b/vopamoi.ts
index 1d357bd50b8a039224d15cb6ec72e29bd202d697..926a1f002c3df87695378176eb999f0a5b068ee1 100644 (file)
--- a/vopamoi.ts
+++ b/vopamoi.ts
@@ -310,6 +310,11 @@ enum CommitOrAbort {
   Abort,
 }
 
   Abort,
 }
 

+interface TagFilter {
+  description: string;
+  include: (task: Element) => boolean;
+}
+

 function BrowserUI() {
   const viewColors: { [key: string]: string } = {
     all: "Gold",
 function BrowserUI() {
   const viewColors: { [key: string]: string } = {
     all: "Gold",


@@ -320,7 +325,7 @@ function BrowserUI() {
     todo: "White",
     waiting: "MediumOrchid",
   };
     todo: "White",
     waiting: "MediumOrchid",
   };

-  var currentTagFilter: string | null = null;
+  var currentTagFilter: TagFilter | null = null;

   var currentViewState = "todo";
   var taskFocusedBeforeJumpingToInput: HTMLElement | null = null;
   var lastTagNameEntered = "";
   var currentViewState = "todo";
   var taskFocusedBeforeJumpingToInput: HTMLElement | null = null;
   var lastTagNameEntered = "";


@@ -611,14 +616,14 @@ function BrowserUI() {
       return ui.setState(createTimestamp, newState, oldState);
     },
 
       return ui.setState(createTimestamp, newState, oldState);
     },
 

-    setTagFilter: function (tag: string) {
+    setTagFilter: function (filter: TagFilter) {

       if (currentTagFilter !== null) {
         this.resetTagView();
       }
 
       const tasksWithTag = new Map();
       for (const task of document.getElementsByClassName("task")) {
       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]);
         }
       }
           tasksWithTag.set(task.getElementsByClassName("desc")[0].textContent, [model.getPriority(task), task]);
         }
       }


@@ -637,7 +642,7 @@ function BrowserUI() {
       }
 
       for (const task of Array.from(document.getElementsByClassName("task"))) {
       }
 
       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);
           task.classList.remove("hide");
         } else {
           const superTask = highestPrioritySuperTask(task);


@@ -649,7 +654,7 @@ function BrowserUI() {
         }
       }
 
         }
       }
 

-      currentTagFilter = tag;
+      currentTagFilter = filter;

       this.setTitle();
     },
 
       this.setTitle();
     },
 


@@ -659,11 +664,11 @@ function BrowserUI() {
         if (!target) return;
         tag = target.textContent!;
       }
         if (!target) return;
         tag = target.textContent!;
       }

-      this.setTagFilter(tag);
+      this.setTagFilter({description: tag, include: task => !!model.hasTag(task, tag!)});

     },
 
     setTitle: function () {
     },
 
     setTitle: function () {

-      document.title = "Vopamoi: " + currentViewState + (currentTagFilter ? ": " + currentTagFilter : "");
+      document.title = "Vopamoi: " + currentViewState + (currentTagFilter ? ": " + currentTagFilter.description : "");

     },
 
     setView: function (state: string) {
     },
 
     setView: function (state: string) {