Change keystroke for cancel: c → C

[vopamoi] / vopamoi.ts

diff --git a/vopamoi.ts b/vopamoi.ts
index 0389a04c2a25f0e00305f3f0232ae366dc86c597..f039b8cc5a2b3871d55791994fb36f521e595a5b 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 currentTagView: 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 = "";


@@ -446,6 +451,7 @@ function BrowserUI() {
       var target = document.activeElement;
       if (!target) return null;
       if (target.classList.contains("tag")) target = target.parentElement!;
       var target = document.activeElement;
       if (!target) return null;
       if (target.classList.contains("tag")) target = target.parentElement!;

+      if (!target.classList.contains("task")) return null;

       return target as HTMLElement;
     },
 
       return target as HTMLElement;
     },
 


@@ -525,7 +531,11 @@ function BrowserUI() {
     },
 
     moveCursorVertically: function (offset: number): boolean {
     },
 
     moveCursorVertically: function (offset: number): boolean {

-      const active = this.currentTask();
+      let active = this.currentTask();
+      if (!active) {
+        this.firstVisibleTask()?.focus();
+        active = this.currentTask();
+      }

       if (!active) return false;
       const dest = this.visibleTaskAtOffset(active, offset);
       if (dest !== active && dest instanceof HTMLElement) {
       if (!active) return false;
       const dest = this.visibleTaskAtOffset(active, offset);
       if (dest !== active && dest instanceof HTMLElement) {


@@ -556,7 +566,8 @@ function BrowserUI() {
     },
 
     resetTagView: function () {
     },
 
     resetTagView: function () {

-      currentTagView = null;
+      currentTagFilter = null;
+      this.setTitle();

       const taskList = document.getElementById("tasks")!;
       for (const task of Array.from(document.getElementsByClassName("task"))) {
         task.classList.remove("hide");
       const taskList = document.getElementById("tasks")!;
       for (const task of Array.from(document.getElementsByClassName("task"))) {
         task.classList.remove("hide");


@@ -605,20 +616,14 @@ function BrowserUI() {
       return ui.setState(createTimestamp, newState, oldState);
     },
 
       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")) {
         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,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 + (currentTagFilter ? ": " + currentTagFilter.description : "");

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


@@ -663,22 +682,14 @@ function BrowserUI() {
       sheet.removeRule(2);
       sheet.removeRule(2);
       currentViewState = state;
       sheet.removeRule(2);
       sheet.removeRule(2);
       currentViewState = state;

+      this.setTitle();

       if (this.currentTask()?.getAttribute("data-state") !== state) {
         this.firstVisibleTask()?.focus();
       }
     },
 
     setUntaggedView: function () {
       if (this.currentTask()?.getAttribute("data-state") !== state) {
         this.firstVisibleTask()?.focus();
       }
     },
 
     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 () {
     },
 
     undo: function () {


@@ -738,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 == "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);
           if (event.key == "d") return browserUI.setState("done");
           if (event.key == "q") return browserUI.setState("todo");
           if (event.key == "s") return (inputState = InputState.S);


@@ -761,7 +772,7 @@ function handleKey(event: any) {
     } else if (inputState === InputState.V) {
       inputState = InputState.Root;
       if (event.key == "a") return browserUI.setView("all");
     } 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 == "d") return browserUI.setView("done");
       if (event.key == "i") return browserUI.setUntaggedView();
       if (event.key == "p") return browserUI.setTagView("Project");
       if (event.key == "d") return browserUI.setView("done");
       if (event.key == "i") return browserUI.setUntaggedView();
       if (event.key == "p") return browserUI.setTagView("Project");


@@ -782,6 +793,7 @@ function handleKey(event: any) {
 
 function browserInit() {
   log.replay();
 
 function browserInit() {
   log.replay();

+  browserUI.setTitle();

   browserUI.firstVisibleTask()?.focus();
   document.body.addEventListener("keydown", handleKey, { capture: false });
 }
   browserUI.firstVisibleTask()?.focus();
   document.body.addEventListener("keydown", handleKey, { capture: false });
 }