Invert priorities

[vopamoi] / vopamoi.ts

diff --git a/vopamoi.ts b/vopamoi.ts
index 7d2f3ee425c60665455ac5eb1e413ebd1ed32ce3..57c7686f9ba29759e1564548e5efb009263acb03 100644 (file)
--- a/vopamoi.ts
+++ b/vopamoi.ts
@@ -46,7 +46,8 @@ const Model = {
     task.setAttribute("tabindex", "0");
     task.setAttribute("data-created", timestamp);
     task.setAttribute("data-state", "todo");
-    document.getElementById("tasks")!.appendChild(task);
+    const tasks = document.getElementById("tasks")!;
+    tasks.insertBefore(task, tasks.firstElementChild);
     return task;
   },
 
@@ -133,7 +134,7 @@ const Model = {
     if (!target) return null;
     target.setAttribute("data-priority", `${priority}`);
     for (const task of document.getElementsByClassName("task")) {
-      if (task !== target && this.getPriority(task) > priority) {
+      if (task !== target && this.getPriority(task) < priority) {
         task.parentElement!.insertBefore(target, task);
         return target;
       }
@@ -282,13 +283,14 @@ function BrowserUI() {
       }
       input.value = "";
       if (event.getModifierState("Control")) {
-        this.makeTopPriority(task);
+        this.makeBottomPriority(task);
       }
     },
 
     beginEdit: function (event: Event) {
-      const task = document.activeElement;
+      var task = document.activeElement;
       if (!task) return;
+      if (task.classList.contains("tag")) task = task.parentElement!;
       const input = document.createElement("input");
       const desc = task.getElementsByClassName("desc")[0];
       const oldDescription = desc.textContent!;
@@ -358,6 +360,7 @@ function BrowserUI() {
         taskFocusedBeforeJumpingToInput = document.activeElement;
       }
       document.getElementById("taskName")!.focus();
+      window.scroll(0, 0);
       event.preventDefault();
     },
 
@@ -385,10 +388,17 @@ function BrowserUI() {
       if (dest instanceof HTMLElement) dest.focus();
     },
 
+    makeBottomPriority: function (task: Element | null = null) {
+      if (!task) task = document.activeElement;
+      if (!task) return;
+      this.setPriority(task, document.getElementById("tasks")!.lastElementChild, null);
+    },
+
     makeTopPriority: function (task: Element | null = null) {
       if (!task) task = document.activeElement;
       if (!task) return;
-      this.setPriority(task, null, document.getElementsByClassName("task")[0]);
+      ui.setPriority(task.getAttribute("data-created")!, clock.now(), Model.getPriority(task));
+      task instanceof HTMLElement && task.focus();
     },
 
     moveCursor: function (offset: number): boolean {
@@ -437,14 +447,14 @@ function BrowserUI() {
 
     // Change task's priority to be between other tasks a and b.
     setPriority: function (task: Element, a: Element | null, b: Element | null) {
-      const aPriority = a === null ? 0 : Model.getPriority(a);
-      const bPriority = b === null ? clock.now() : Model.getPriority(b);
-      console.assert(aPriority < bPriority, aPriority, "<", bPriority);
-      const span = bPriority - aPriority;
-      const newPriority = aPriority + 0.1 * span + 0.8 * span * Math.random();
-      console.assert(aPriority < newPriority && newPriority < bPriority, aPriority, "<", newPriority, "<", bPriority);
+      const aPriority = a === null ? clock.now() : Model.getPriority(a);
+      const bPriority = b === null ? 0 : Model.getPriority(b);
+      console.assert(aPriority > bPriority, aPriority, ">", bPriority);
+      const span = aPriority - bPriority;
+      const newPriority = bPriority + 0.1 * span + 0.8 * span * Math.random();
+      console.assert(aPriority > newPriority && newPriority > bPriority, aPriority, ">", newPriority, ">", bPriority);
       const newPriorityRounded = Math.round(newPriority);
-      const okToRound = aPriority < newPriorityRounded && newPriorityRounded < bPriority;
+      const okToRound = aPriority > newPriorityRounded && newPriorityRounded > bPriority;
       ui.setPriority(task.getAttribute("data-created")!, okToRound ? newPriorityRounded : newPriority, Model.getPriority(task));
       task instanceof HTMLElement && task.focus();
     },
@@ -489,6 +499,7 @@ function BrowserUI() {
 }
 const browserUI = BrowserUI();
 
+const scrollIncrement = 60;
 enum InputState {
   Root,
   S,
@@ -517,25 +528,30 @@ function handleKey(event: any) {
         return (inputCount = (inputCount ?? 0) * 10 + parseInt(event.key));
       }
       try {
-        if (event.key == "j") return browserUI.moveCursor(inputCount ?? 1);
-        if (event.key == "k") return browserUI.moveCursor(-(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 == "T") return browserUI.makeTopPriority();
-        if (event.key == "n") return browserUI.focusTaskNameInput(event);
-        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 == "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 == "r") return browserUI.redo();
-        if (event.key == "e") return browserUI.beginEdit(event);
-        if (event.key == "t") return browserUI.beginTagEdit(event);
-        if (event.key == "v") return (inputState = InputState.V);
+        if (event.ctrlKey) {
+          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.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 == "T") return browserUI.makeTopPriority();
+          if (event.key == "n") return browserUI.focusTaskNameInput(event);
+          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 == "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 == "r") return browserUI.redo();
+          if (event.key == "e") return browserUI.beginEdit(event);
+          if (event.key == "t") return browserUI.beginTagEdit(event);
+          if (event.key == "v") return (inputState = InputState.V);
+        }
       } finally {
         inputCount = null;
       }