X-Git-Url: http://git.scottworley.com/vopamoi/blobdiff_plain/b9f7e98914ca882508950ec54e27d78a11f5179e..refs/heads/main:/vopamoi.ts diff --git a/vopamoi.ts b/vopamoi.ts index 0389a04..17ace05 100644 --- a/vopamoi.ts +++ b/vopamoi.ts @@ -1,3 +1,19 @@ +// vopamoi: vi-flavored todo organizer +// Copyright (C) 2023 Scott Worley +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 3. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + + // Typescript doesn't know about MAX_SAFE_INTEGER?? This was supposed to be // fixed in typescript 2.0.1 in 2016, but is not working for me in typescript // 4.2.4 in 2022. :( https://github.com/microsoft/TypeScript/issues/9937 @@ -310,6 +326,11 @@ enum CommitOrAbort { Abort, } +interface TagFilter { + description: string; + include: (task: Element) => boolean; +} + function BrowserUI() { const viewColors: { [key: string]: string } = { all: "Gold", @@ -317,10 +338,10 @@ function BrowserUI() { deleted: "Black", done: "LawnGreen", "someday-maybe": "DeepSkyBlue", - todo: "White", + todo: "rgb(0 0 0 / 0)", waiting: "MediumOrchid", }; - var currentTagView: string | null = null; + var currentTagFilter: TagFilter | null = null; var currentViewState = "todo"; var taskFocusedBeforeJumpingToInput: HTMLElement | null = null; var lastTagNameEntered = ""; @@ -446,6 +467,7 @@ function BrowserUI() { 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; }, @@ -525,7 +547,11 @@ function BrowserUI() { }, 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) { @@ -556,7 +582,8 @@ function BrowserUI() { }, 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"); @@ -605,20 +632,14 @@ function BrowserUI() { 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")) { - if (model.hasTag(task, tag)) { + if (filter.include(task)) { tasksWithTag.set(task.getElementsByClassName("desc")[0].textContent, [model.getPriority(task), task]); } } @@ -637,7 +658,7 @@ function BrowserUI() { } 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); @@ -649,7 +670,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) { @@ -663,22 +698,19 @@ function BrowserUI() { sheet.removeRule(2); sheet.removeRule(2); currentViewState = state; + this.setTitle(); 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}); + }, + + toggleDark: function () { + document.body.classList.toggle("dark"); + this.setView(currentViewState); }, undo: function () { @@ -738,7 +770,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 == "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); @@ -761,8 +793,12 @@ function handleKey(event: any) { } 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 == "c") return browserUI.setTagView("comp"); + if (event.key == "D") return browserUI.toggleDark(); if (event.key == "d") return browserUI.setView("done"); + if (event.key == "e") return browserUI.setTagView("errand"); + if (event.key == "h") return browserUI.setTagView("home"); if (event.key == "i") return browserUI.setUntaggedView(); if (event.key == "p") return browserUI.setTagView("Project"); if (event.key == "q") return browserUI.setView("todo"); @@ -773,6 +809,7 @@ function handleKey(event: any) { if (event.key == "v") return browserUI.resetView(); if (event.key == "w") return browserUI.setView("waiting"); if (event.key == "x") return browserUI.setView("deleted"); + if (event.key == "z") return browserUI.setTagView("zombie"); } else if (inputState === InputState.VS) { inputState = InputState.Root; if (event.key == "m") return browserUI.setView("someday-maybe"); @@ -782,6 +819,7 @@ function handleKey(event: any) { function browserInit() { log.replay(); + browserUI.setTitle(); browserUI.firstVisibleTask()?.focus(); document.body.addEventListener("keydown", handleKey, { capture: false }); }