Don't change state if it's already in that state

[vopamoi] / vopamoi.ts

diff --git a/vopamoi.ts b/vopamoi.ts
index 298e513fde6ff3df3abe46fc3080435ae9a854b8..e997d1c38c8572ed5f60dfe7c5828c4bf5979958 100644 (file)
--- a/vopamoi.ts
+++ b/vopamoi.ts
@@ -21,7 +21,6 @@ const Model = {
     task.setAttribute("tabindex", "0");
     task.setAttribute("data-created", timestamp);
     document.getElementById("tasks")!.appendChild(task);
-    task.focus();
     return task;
   },
 
@@ -51,12 +50,10 @@ const Model = {
     for (const task of document.getElementsByClassName("task")) {
       if (task !== target && this.getPriority(task) > priority) {
         task.parentElement!.insertBefore(target, task);
-        target instanceof HTMLElement && target.focus();
         return target;
       }
     }
     document.getElementById("tasks")!.appendChild(target);
-    target instanceof HTMLElement && target.focus();
     return target;
   },
 
@@ -140,6 +137,7 @@ const BrowserUI = {
     const input = <HTMLInputElement>document.getElementById("taskName");
     if (input.value) {
       const task = UI.addTask(input.value);
+      if (task && task instanceof HTMLElement) task.focus();
       input.value = "";
       if (event.getModifierState("Control")) {
         this.setPriority(task, null, document.getElementsByClassName("task")[0]);
@@ -212,14 +210,17 @@ const BrowserUI = {
     const newPriorityRounded = Math.round(newPriority);
     const okToRound = aPriority < newPriorityRounded && newPriorityRounded < bPriority;
     UI.setPriority(task.getAttribute("data-created")!, okToRound ? newPriorityRounded : newPriority, Model.getPriority(task));
+    task instanceof HTMLElement && task.focus();
   },
 
-  setState: function (state: string) {
+  setState: function (newState: string) {
     const task = document.activeElement;
     if (!task) return;
+    const oldState = Model.getState(task);
+    if (newState === oldState) return;
     const createTimestamp = task.getAttribute("data-created")!;
     this.moveCursor(1) || this.moveCursor(-1);
-    return UI.setState(createTimestamp, state, Model.getState(task));
+    return UI.setState(createTimestamp, newState, oldState);
   },
 
   undo: function () {
@@ -241,6 +242,7 @@ function handleKey(event: any) {
     if (event.key == "w") return BrowserUI.setState("waiting");
     if (event.key == "d") return BrowserUI.setState("done");
     if (event.key == "c") return BrowserUI.setState("cancelled");
+    if (event.key == "t") return BrowserUI.setState("todo");
     if (event.key == "X") return BrowserUI.setState("deleted");
     if (event.key == "u") return BrowserUI.undo();
   }