Rename: moveCursor → moveCursorVertically

[vopamoi] / vopamoi.ts

diff --git a/vopamoi.ts b/vopamoi.ts
index 6ba608a4478481fbfcd6fb06f506f5b3ac439fbe..302307fe31df5d25c8c5498dab70cb671075c19b 100644 (file)
--- a/vopamoi.ts
+++ b/vopamoi.ts
@@ -120,6 +120,17 @@ const Model = {
     }
   },
 
     }
   },
 

+  insertInPriorityOrder: function (task: Element, dest: Element) {
+    const priority = this.getPriority(task);
+    for (const t of dest.children) {
+      if (t !== task && this.getPriority(t) < priority) {
+        dest.insertBefore(task, t);
+        return;
+      }
+    }
+    dest.appendChild(task);
+  },
+

   removeTag: function (createTimestamp: string, tagName: string) {
     const task = this.getTask(createTimestamp);
     if (!task) return null;
   removeTag: function (createTimestamp: string, tagName: string) {
     const task = this.getTask(createTimestamp);
     if (!task) return null;


@@ -133,13 +144,7 @@ const Model = {
     const target = this.getTask(createTimestamp);
     if (!target) return null;
     target.setAttribute("data-priority", `${priority}`);
     const target = this.getTask(createTimestamp);
     if (!target) return null;
     target.setAttribute("data-priority", `${priority}`);

-    for (const task of document.getElementsByClassName("task")) {
-      if (task !== target && this.getPriority(task) < priority) {
-        task.parentElement!.insertBefore(target, task);
-        return target;
-      }
-    }
-    document.getElementById("tasks")!.appendChild(target);
+    this.insertInPriorityOrder(target, target.parentElement!);

     return target;
   },
 
     return target;
   },
 


@@ -436,7 +441,7 @@ function BrowserUI() {
       task instanceof HTMLElement && task.focus();
     },
 
       task instanceof HTMLElement && task.focus();
     },
 

-    moveCursor: function (offset: number): boolean {
+    moveCursorVertically: function (offset: number): boolean {

       const active = this.currentTask();
       if (!active) return false;
       const dest = this.visibleTaskAtOffset(active, offset);
       const active = this.currentTask();
       if (!active) return false;
       const dest = this.visibleTaskAtOffset(active, offset);


@@ -469,8 +474,12 @@ function BrowserUI() {
 
     resetTagView: function () {
       currentTagView = null;
 
     resetTagView: function () {
       currentTagView = null;

-      for (const task of document.getElementsByClassName("task")) {
+      const taskList = document.getElementById("tasks")!;
+      for (const task of Array.from(document.getElementsByClassName("task"))) {

         task.classList.remove("hide");
         task.classList.remove("hide");

+        if (task.parentElement !== taskList) {
+          Model.insertInPriorityOrder(task, taskList);
+        }

       }
     },
 
       }
     },
 


@@ -508,22 +517,55 @@ function BrowserUI() {
       if (newState === oldState) return;
       const createTimestamp = task.getAttribute("data-created")!;
       if (currentViewState !== "all" || newState == "deleted") {
       if (newState === oldState) return;
       const createTimestamp = task.getAttribute("data-created")!;
       if (currentViewState !== "all" || newState == "deleted") {

-        this.moveCursor(1) || this.moveCursor(-1);
+        this.moveCursorVertically(1) || this.moveCursorVertically(-1);

       }
       return ui.setState(createTimestamp, newState, oldState);
     },
 
       }
       return ui.setState(createTimestamp, newState, oldState);
     },
 

-    setTagView: function () {
-      const target = this.currentTag();
-      if (!target) return;
-      const tag = target.textContent!;
+    setTagView: function (tag: string | null = null) {
+      if (tag === null) {
+        const target = this.currentTag();
+        if (!target) return;
+        tag = target.textContent!;
+      }
+
+      if (currentTagView !== null) {
+        this.resetTagView();
+      }
+
+      const tasksWithTag = new Map();

       for (const task of document.getElementsByClassName("task")) {
       for (const task of document.getElementsByClassName("task")) {

+        if (Model.hasTag(task, tag)) {
+          tasksWithTag.set(task.getElementsByClassName("desc")[0].textContent, [Model.getPriority(task), task]);
+        }
+      }
+
+      function highestPrioritySuperTask(t: Element) {
+        var maxPriority = -1;
+        var superTask = null;
+        for (const child of t.getElementsByClassName("tag")) {
+          const e = tasksWithTag.get(child.textContent);
+          if (e !== undefined && e[0] > maxPriority) {
+            maxPriority = e[0];
+            superTask = e[1];
+          }
+        }
+        return superTask;
+      }
+
+      for (const task of Array.from(document.getElementsByClassName("task"))) {

         if (Model.hasTag(task, tag)) {
           task.classList.remove("hide");
         } else {
         if (Model.hasTag(task, tag)) {
           task.classList.remove("hide");
         } else {

-          task.classList.add("hide");
+          const superTask = highestPrioritySuperTask(task);
+          if (superTask !== null) {
+            Model.insertInPriorityOrder(task, superTask);
+          } else {
+            task.classList.add("hide");
+          }

         }
       }
         }
       }

+

       currentTagView = tag;
     },
 
       currentTagView = tag;
     },
 


@@ -544,6 +586,9 @@ function BrowserUI() {
     },
 
     setUntaggedView: function () {
     },
 
     setUntaggedView: function () {

+      if (currentTagView !== null) {
+        this.resetTagView();
+      }

       for (const task of document.getElementsByClassName("task")) {
         if (task.getElementsByClassName("tag").length === 0) {
           task.classList.remove("hide");
       for (const task of document.getElementsByClassName("task")) {
         if (task.getElementsByClassName("tag").length === 0) {
           task.classList.remove("hide");


@@ -598,8 +643,8 @@ function handleKey(event: any) {
           if (event.key == "e") return window.scrollBy(0, (inputCount ?? 1) * scrollIncrement);
           if (event.key == "y") return window.scrollBy(0, (inputCount ?? 1) * -scrollIncrement);
         } else {
           if (event.key == "e") return window.scrollBy(0, (inputCount ?? 1) * scrollIncrement);
           if (event.key == "y") return window.scrollBy(0, (inputCount ?? 1) * -scrollIncrement);
         } else {

-          if (event.key == "j") return browserUI.moveCursor(inputCount ?? 1);
-          if (event.key == "k") return browserUI.moveCursor(-(inputCount ?? 1));
+          if (event.key == "j") return browserUI.moveCursorVertically(inputCount ?? 1);
+          if (event.key == "k") return browserUI.moveCursorVertically(-(inputCount ?? 1));

           if (event.key == "J") return browserUI.moveTask(inputCount ?? 1);
           if (event.key == "K") return browserUI.moveTask(-(inputCount ?? 1));
           if (event.key == "G") return browserUI.jumpCursor(inputCount ?? MAX_SAFE_INTEGER);
           if (event.key == "J") return browserUI.moveTask(inputCount ?? 1);
           if (event.key == "K") return browserUI.moveTask(-(inputCount ?? 1));
           if (event.key == "G") return browserUI.jumpCursor(inputCount ?? MAX_SAFE_INTEGER);


@@ -630,6 +675,7 @@ function handleKey(event: any) {
       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 == "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 == "q") return browserUI.setView("todo");
       if (event.key == "s") return (inputState = InputState.VS);
       if (event.key == "T") return browserUI.resetTagView();
       if (event.key == "q") return browserUI.setView("todo");
       if (event.key == "s") return (inputState = InputState.VS);
       if (event.key == "T") return browserUI.resetTagView();