X-Git-Url: http://git.scottworley.com/vopamoi/blobdiff_plain/ef12457ba4f0d6708b2d4d7af7badd68aa105675..HEAD:/vopamoi.ts diff --git a/vopamoi.ts b/vopamoi.ts index f0c8930..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 @@ -45,7 +61,7 @@ function Model() { task.appendChild(desc); task.classList.add("task"); task.setAttribute("tabindex", "0"); - task.setAttribute("data-created", timestamp); + task.setAttribute("id", timestamp); task.setAttribute("data-state", "todo"); const tasks = document.getElementById("tasks")!; tasks.insertBefore(task, tasks.firstElementChild); @@ -97,6 +113,37 @@ function Model() { return target; }, + editContent: function (createTimestamp: string, newContent: string): Element | null { + const target = this.getTask(createTimestamp); + if (!target) return null; + if (target.hasAttribute("data-content")) { + // Oh no: An edit has arrived from a replica while a local edit is in progress. + const input = target.getElementsByTagName("textarea")[0]!; + if ( + input.value === target.getAttribute("data-content") && + input.selectionStart === input.value.length && + input.selectionEnd === input.value.length + ) { + // No local changes have actually been made yet. Change the contents of the edit box! + input.value = newContent; + } else { + // No great options. + // Prefer not to interrupt the local user's edit. + // The remote edit is mostly lost; this mostly becomes last-write-wins. + target.setAttribute("data-content", newContent); + } + } else { + var content = target.getElementsByClassName("content")[0]; + if (!content) { + content = document.createElement("div"); + content.classList.add("content"); + target.appendChild(content); + } + content.textContent = newContent; + } + return target; + }, + hasTag: function (task: Element, tag: string): Element | null { for (const child of task.getElementsByClassName("tag")) { if (child.textContent === tag) { @@ -110,15 +157,11 @@ function Model() { if (task.hasAttribute("data-priority")) { return parseFloat(task.getAttribute("data-priority")!); } - return parseFloat(task.getAttribute("data-created")!); + return parseFloat(task.getAttribute("id")!); }, getTask: function (createTimestamp: string) { - for (const task of document.getElementsByClassName("task")) { - if (task.getAttribute("data-created") === createTimestamp) { - return task; - } - } + return document.getElementById(createTimestamp); }, insertInPriorityOrder: function (task: Element, dest: Element) { @@ -182,6 +225,10 @@ function Log(prefix: string = "vp-") { const [createTimestamp, description] = splitN(data, " ", 1); return model.edit(createTimestamp, description); } + if (command == "EditContent") { + const [createTimestamp, content] = splitN(data, " ", 1); + return model.editContent(createTimestamp, content); + } if (command == "Priority") { const [createTimestamp, newPriority] = splitN(data, " ", 1); return model.setPriority(createTimestamp, parseFloat(newPriority)); @@ -244,6 +291,9 @@ function UI() { edit: function (createTimestamp: string, newDescription: string, oldDescription: string) { return perform(`Edit ${createTimestamp} ${newDescription}`, `Edit ${createTimestamp} ${oldDescription}`); }, + editContent: function (createTimestamp: string, newContent: string, oldContent: string) { + return perform(`EditContent ${createTimestamp} ${newContent}`, `EditContent ${createTimestamp} ${oldContent}`); + }, removeTag: function (createTimestamp: string, tag: string) { return perform(`Untag ${createTimestamp} ${tag}`, `Tag ${createTimestamp} ${tag}`); }, @@ -276,6 +326,11 @@ enum CommitOrAbort { Abort, } +interface TagFilter { + description: string; + include: (task: Element) => boolean; +} + function BrowserUI() { const viewColors: { [key: string]: string } = { all: "Gold", @@ -283,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 = ""; @@ -322,6 +377,21 @@ function BrowserUI() { event.preventDefault(); }, + beginEditContent: function (event: Event) { + const task = this.currentTask(); + if (!task) return; + const input = document.createElement("textarea"); + const content = task.getElementsByClassName("content")[0]; + const oldContent = content?.textContent ?? ""; + task.setAttribute("data-content", oldContent); + input.value = oldContent; + input.addEventListener("blur", this.completeContentEdit, { once: true }); + if (content) content.textContent = ""; + task.appendChild(input); + input.focus(); + event.preventDefault(); + }, + beginTagEdit: function (event: Event) { const task = this.currentTask(); if (!task) return; @@ -348,7 +418,24 @@ function BrowserUI() { if (resolution === CommitOrAbort.Abort || newDescription.match(/^ *$/) || newDescription === oldDescription) { desc.textContent = oldDescription; } else { - ui.edit(task.getAttribute("data-created")!, newDescription, oldDescription); + ui.edit(task.getAttribute("id")!, newDescription, oldDescription); + } + }, + + completeContentEdit: function (event: Event, resolution: CommitOrAbort = CommitOrAbort.Commit) { + const input = event.target as HTMLInputElement; + const task = input.parentElement!; + const content = task.getElementsByClassName("content")[0]; + const oldContent = task.getAttribute("data-content")!; + const newContent = input.value; + input.removeEventListener("blur", this.completeContentEdit); + task.removeChild(input); + task.removeAttribute("data-content"); + task.focus(); + if (resolution === CommitOrAbort.Abort || newContent === oldContent) { + if (content) content.textContent = oldContent; + } else { + ui.editContent(task.getAttribute("id")!, newContent, oldContent); } }, @@ -360,7 +447,7 @@ function BrowserUI() { task.removeChild(input); task.focus(); if (resolution === CommitOrAbort.Commit && !newTagName.match(/^ *$/) && !model.hasTag(task, newTagName)) { - ui.addTag(task.getAttribute("data-created")!, newTagName); + ui.addTag(task.getAttribute("id")!, newTagName); lastTagNameEntered = newTagName; } }, @@ -380,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; }, @@ -440,7 +528,7 @@ function BrowserUI() { makeTopPriority: function (task: Element | null = null) { if (!task) task = this.currentTask(); if (!task) return; - ui.setPriority(task.getAttribute("data-created")!, clock.now(), model.getPriority(task)); + ui.setPriority(task.getAttribute("id")!, clock.now(), model.getPriority(task)); task instanceof HTMLElement && task.focus(); }, @@ -459,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) { @@ -486,11 +578,12 @@ function BrowserUI() { removeTag: function () { const target = this.currentTag(); if (!target) return; - ui.removeTag(target.parentElement!.getAttribute("data-created")!, target.textContent!); + ui.removeTag(target.parentElement!.getAttribute("id")!, target.textContent!); }, 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"); @@ -523,7 +616,7 @@ function BrowserUI() { console.assert(aPriority > newPriority && newPriority > bPriority, aPriority, ">", newPriority, ">", bPriority); const newPriorityRounded = Math.round(newPriority); const okToRound = aPriority > newPriorityRounded && newPriorityRounded > bPriority; - ui.setPriority(task.getAttribute("data-created")!, okToRound ? newPriorityRounded : newPriority, model.getPriority(task)); + ui.setPriority(task.getAttribute("id")!, okToRound ? newPriorityRounded : newPriority, model.getPriority(task)); task instanceof HTMLElement && task.focus(); }, @@ -532,27 +625,21 @@ function BrowserUI() { if (!task) return; const oldState = task.getAttribute("data-state")!; if (newState === oldState) return; - const createTimestamp = task.getAttribute("data-created")!; + const createTimestamp = task.getAttribute("id")!; if (currentViewState !== "all" || newState == "deleted") { this.moveCursorVertically(1) || this.moveCursorVertically(-1); } 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]); } } @@ -571,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); @@ -583,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) { @@ -597,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 () { @@ -639,7 +737,10 @@ var inputCount: number | null = null; function handleKey(event: any) { if (["Alt", "Control", "Meta", "Shift"].includes(event.key)) return; - if (event.target.tagName === "INPUT") { + if (event.target.tagName === "TEXTAREA") { + if (event.key == "Enter" && event.ctrlKey) return browserUI.completeContentEdit(event); + if (event.key == "Escape") return browserUI.completeContentEdit(event, CommitOrAbort.Abort); + } else if (event.target.tagName === "INPUT") { if (event.target.id === "taskName") { if (event.key == "Enter") return browserUI.addTask(event); if (event.key == "Escape") return browserUI.returnFocusAfterInput(); @@ -669,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); @@ -678,6 +779,7 @@ function handleKey(event: any) { 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.beginEditContent(event); if (event.key == "e") return browserUI.beginEdit(event); if (event.key == "t") return browserUI.beginTagEdit(event); if (event.key == "v") return (inputState = InputState.V); @@ -691,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"); @@ -703,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"); @@ -712,6 +819,7 @@ function handleKey(event: any) { function browserInit() { log.replay(); + browserUI.setTitle(); browserUI.firstVisibleTask()?.focus(); document.body.addEventListener("keydown", handleKey, { capture: false }); }