Disallow all-spaces task descriptions and tag-names

[vopamoi] / vopamoi.ts

diff --git a/vopamoi.ts b/vopamoi.ts
index 31a4cdcd858a56b7f72fe75dd1ccecbe756cb881..6519cbfc4367a1f2290a5598b07f9f001d9a87c4 100644 (file)
--- a/vopamoi.ts
+++ b/vopamoi.ts
@@ -235,18 +235,17 @@ function BrowserUI() {
   return {
     addTask: function (event: KeyboardEvent) {
       const input = <HTMLInputElement>document.getElementById("taskName");
-      if (input.value) {
-        const task = ui.addTask(input.value);
-        if (currentViewState === "todo") {
-          task instanceof HTMLElement && task.focus();
-        } else if (this.returnFocusAfterInput()) {
-        } else {
-          this.firstVisibleTask()?.focus();
-        }
-        input.value = "";
-        if (event.getModifierState("Control")) {
-          this.setPriority(task, null, document.getElementsByClassName("task")[0]);
-        }
+      if (input.value.match(/^ *$/)) return;
+      const task = ui.addTask(input.value);
+      if (currentViewState === "todo") {
+        task instanceof HTMLElement && task.focus();
+      } else if (this.returnFocusAfterInput()) {
+      } else {
+        this.firstVisibleTask()?.focus();
+      }
+      input.value = "";
+      if (event.getModifierState("Control")) {
+        this.setPriority(task, null, document.getElementsByClassName("task")[0]);
       }
     },
 
@@ -288,7 +287,7 @@ function BrowserUI() {
       task.removeChild(input);
       task.removeAttribute("data-description");
       task.focus();
-      if (newDescription === oldDescription || resolution === CommitOrAbort.Abort) {
+      if (resolution === CommitOrAbort.Abort || newDescription.match(/^ *$/) || newDescription === oldDescription) {
         desc.textContent = oldDescription;
       } else {
         ui.edit(task.getAttribute("data-created")!, newDescription, oldDescription);
@@ -302,7 +301,7 @@ function BrowserUI() {
       input.removeEventListener("blur", this.completeTagEdit);
       task.removeChild(input);
       task.focus();
-      if (resolution === CommitOrAbort.Commit && newTagName && !Model.hasTag(task, newTagName)) {
+      if (resolution === CommitOrAbort.Commit && !newTagName.match(/^ *$/) && !Model.hasTag(task, newTagName)) {
         ui.addTag(task.getAttribute("data-created")!, newTagName);
         lastTagNameEntered = newTagName;
       }
@@ -397,10 +396,12 @@ function BrowserUI() {
       return ui.setState(createTimestamp, newState, oldState);
     },
 
-    setView: function (state: string) {
+    setView: function (state: string, color: string) {
       const sheet = (document.getElementById("viewStyle") as HTMLStyleElement).sheet!;
       sheet.insertRule(`.task:not([data-state=${state}]) { display: none }`);
-      sheet.removeRule(1);
+      sheet.insertRule(`:root { --view-state-indicator-color: ${color}; }`);
+      sheet.removeRule(2);
+      sheet.removeRule(2);
       currentViewState = state;
       if (document.activeElement?.getAttribute("data-state") !== state) {
         this.firstVisibleTask()?.focus();
@@ -452,18 +453,18 @@ function handleKey(event: any) {
       if (event.key == "v") return (inputState = InputState.View);
     } else if (inputState === InputState.View) {
       inputState = InputState.Command;
-      if (event.key == "c") return browserUI.setView("cancelled");
-      if (event.key == "d") return browserUI.setView("done");
-      if (event.key == "q") return browserUI.setView("todo");
-      if (event.key == "s") return browserUI.setView("someday-maybe");
-      if (event.key == "w") return browserUI.setView("waiting");
-      if (event.key == "x") return browserUI.setView("deleted");
+      if (event.key == "c") return browserUI.setView("cancelled", "Red");
+      if (event.key == "d") return browserUI.setView("done", "LawnGreen");
+      if (event.key == "q") return browserUI.setView("todo", "White");
+      if (event.key == "s") return browserUI.setView("someday-maybe", "DeepSkyBlue");
+      if (event.key == "w") return browserUI.setView("waiting", "MediumOrchid");
+      if (event.key == "x") return browserUI.setView("deleted", "Black");
     }
   }
 }
 
 function browserInit() {
-  document.body.addEventListener("keydown", handleKey, { capture: false });
   log.replay();
   browserUI.firstVisibleTask()?.focus();
+  document.body.addEventListener("keydown", handleKey, { capture: false });
 }