X-Git-Url: http://git.scottworley.com/vopamoi/blobdiff_plain/9db534f6ab9420b8fd5836e791dbe09abb0a92d8..HEAD:/vopamoi.ts diff --git a/vopamoi.ts b/vopamoi.ts index f550fa1..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 @@ -35,137 +51,167 @@ function hashHue(str: string) { return crypto.subtle.digest("SHA-256", new TextEncoder().encode(str)).then((buf) => (new Uint16Array(buf)[0] * 360) / 2 ** 16); } -const Model = { - addTask: function (timestamp: string, description: string): Element { - const task = document.createElement("div"); - const desc = document.createElement("span"); - desc.textContent = description; - desc.classList.add("desc"); - task.appendChild(desc); - task.classList.add("task"); - task.setAttribute("tabindex", "0"); - task.setAttribute("data-created", timestamp); - task.setAttribute("data-state", "todo"); - const tasks = document.getElementById("tasks")!; - tasks.insertBefore(task, tasks.firstElementChild); - return task; - }, - - addTag: function (createTimestamp: string, tagName: string): Element | null { - const task = this.getTask(createTimestamp); - if (!task) return null; - const existingTag = this.hasTag(task, tagName); - if (existingTag) return existingTag; - const tag = document.createElement("span"); - tag.appendChild(document.createTextNode(tagName)); - tag.classList.add("tag"); - tag.setAttribute("tabindex", "0"); - hashHue(tagName).then((hue) => (tag.style.backgroundColor = `hsl(${hue},90%,45%)`)); - for (const child of task.getElementsByClassName("tag")) { - if (tagName > child.textContent!) { - task.insertBefore(tag, child); - return tag; +function Model() { + return { + addTask: function (timestamp: string, description: string): Element { + const task = document.createElement("div"); + const desc = document.createElement("span"); + desc.textContent = description; + desc.classList.add("desc"); + task.appendChild(desc); + task.classList.add("task"); + task.setAttribute("tabindex", "0"); + task.setAttribute("id", timestamp); + task.setAttribute("data-state", "todo"); + const tasks = document.getElementById("tasks")!; + tasks.insertBefore(task, tasks.firstElementChild); + return task; + }, + + addTag: function (createTimestamp: string, tagName: string): Element | null { + const task = this.getTask(createTimestamp); + if (!task) return null; + const existingTag = this.hasTag(task, tagName); + if (existingTag) return existingTag; + const tag = document.createElement("span"); + tag.appendChild(document.createTextNode(tagName)); + tag.classList.add("tag"); + tag.setAttribute("tabindex", "0"); + hashHue(tagName).then((hue) => (tag.style.backgroundColor = `hsl(${hue},90%,45%)`)); + for (const child of task.getElementsByClassName("tag")) { + if (tagName > child.textContent!) { + task.insertBefore(tag, child); + return tag; + } } - } - task.insertBefore(tag, task.getElementsByClassName("desc")[0]!); - return tag; - }, - - edit: function (createTimestamp: string, newDescription: string): Element | null { - const target = this.getTask(createTimestamp); - if (!target) return null; - if (target.hasAttribute("data-description")) { - // Oh no: An edit has arrived from a replica while a local edit is in progress. - const input = target.getElementsByTagName("input")[0]!; - if ( - input.value === target.getAttribute("data-description") && - 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 = newDescription; + task.insertBefore(tag, task.getElementsByClassName("desc")[0]!); + return tag; + }, + + edit: function (createTimestamp: string, newDescription: string): Element | null { + const target = this.getTask(createTimestamp); + if (!target) return null; + if (target.hasAttribute("data-description")) { + // Oh no: An edit has arrived from a replica while a local edit is in progress. + const input = target.getElementsByTagName("input")[0]!; + if ( + input.value === target.getAttribute("data-description") && + 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 = newDescription; + } 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-description", newDescription); + } } 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-description", newDescription); + target.getElementsByClassName("desc")[0].textContent = newDescription; } - } else { - target.getElementsByClassName("desc")[0].textContent = newDescription; - } - return target; - }, + return target; + }, - hasTag: function (task: Element, tag: string): Element | null { - for (const child of task.getElementsByClassName("tag")) { - if (child.textContent === tag) { - return child; + 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 null; - }, + return target; + }, - getPriority: function (task: Element): number { - if (task.hasAttribute("data-priority")) { - return parseFloat(task.getAttribute("data-priority")!); - } - return parseFloat(task.getAttribute("data-created")!); - }, + hasTag: function (task: Element, tag: string): Element | null { + for (const child of task.getElementsByClassName("tag")) { + if (child.textContent === tag) { + return child; + } + } + return null; + }, - getTask: function (createTimestamp: string) { - for (const task of document.getElementsByClassName("task")) { - if (task.getAttribute("data-created") === createTimestamp) { - return task; + getPriority: function (task: Element): number { + if (task.hasAttribute("data-priority")) { + return parseFloat(task.getAttribute("data-priority")!); } - } - }, + return parseFloat(task.getAttribute("id")!); + }, + + getTask: function (createTimestamp: string) { + return document.getElementById(createTimestamp); + }, + + insertInPriorityOrder: function (task: Element, dest: Element) { + const priority = this.getPriority(task); + for (const t of dest.children) { + if (t !== task && this.getPriority(t) < priority) { + dest.insertBefore(task, t); + return; + } + } + dest.appendChild(task); + }, - insertInPriorityOrder: function (task: Element, dest: Element) { - const priority = this.getPriority(task); - for (const t of dest.children) { - if (t !== task && this.getPriority(t) < priority) { - dest.insertBefore(task, t); + removeTag: function (createTimestamp: string, tagName: string) { + const task = this.getTask(createTimestamp); + if (!task) return null; + const tag = this.hasTag(task, tagName); + if (!tag) return; + task.removeChild(tag); + if (task instanceof HTMLElement) task.focus(); + }, + + setPriority: function (createTimestamp: string, priority: number): Element | null { + const target = this.getTask(createTimestamp); + if (!target) return null; + target.setAttribute("data-priority", `${priority}`); + this.insertInPriorityOrder(target, target.parentElement!); + return target; + }, + + setState: function (stateTimestamp: string, createTimestamp: string, state: string) { + const task = this.getTask(createTimestamp); + if (!task) return; + task.setAttribute("data-state", state); + var date = task.getElementsByClassName("statedate")[0]; + if (state === "todo") { + task.removeChild(date); return; } - } - dest.appendChild(task); - }, - - removeTag: function (createTimestamp: string, tagName: string) { - const task = this.getTask(createTimestamp); - if (!task) return null; - const tag = this.hasTag(task, tagName); - if (!tag) return; - task.removeChild(tag); - if (task instanceof HTMLElement) task.focus(); - }, - - setPriority: function (createTimestamp: string, priority: number): Element | null { - const target = this.getTask(createTimestamp); - if (!target) return null; - target.setAttribute("data-priority", `${priority}`); - this.insertInPriorityOrder(target, target.parentElement!); - return target; - }, - - setState: function (stateTimestamp: string, createTimestamp: string, state: string) { - const task = this.getTask(createTimestamp); - if (!task) return; - task.setAttribute("data-state", state); - var date = task.getElementsByClassName("statedate")[0]; - if (state === "todo") { - task.removeChild(date); - return; - } - if (!date) { - date = document.createElement("span"); - date.classList.add("statedate"); - task.insertBefore(date, task.firstChild); - } - const d = new Date(parseInt(stateTimestamp)); - date.textContent = `${d.getFullYear()}-${`${d.getMonth() + 1}`.padStart(2, "0")}-${`${d.getDate()}`.padStart(2, "0")}`; - }, -}; + if (!date) { + date = document.createElement("span"); + date.classList.add("statedate"); + task.insertBefore(date, task.firstChild); + } + const d = new Date(parseInt(stateTimestamp)); + date.textContent = `${d.getFullYear()}-${`${d.getMonth() + 1}`.padStart(2, "0")}-${`${d.getDate()}`.padStart(2, "0")}`; + }, + }; +} +const model = Model(); function Log(prefix: string = "vp-") { var next_log_index = 0; @@ -173,27 +219,31 @@ function Log(prefix: string = "vp-") { apply: function (entry: string) { const [timestamp, command, data] = splitN(entry, " ", 2); if (command == "Create") { - return Model.addTask(timestamp, data); + return model.addTask(timestamp, data); } if (command == "Edit") { const [createTimestamp, description] = splitN(data, " ", 1); - return Model.edit(createTimestamp, description); + 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)); + return model.setPriority(createTimestamp, parseFloat(newPriority)); } if (command == "State") { const [createTimestamp, state] = splitN(data, " ", 1); - return Model.setState(timestamp, createTimestamp, state); + return model.setState(timestamp, createTimestamp, state); } if (command == "Tag") { const [createTimestamp, tag] = splitN(data, " ", 1); - return Model.addTag(createTimestamp, tag); + return model.addTag(createTimestamp, tag); } if (command == "Untag") { const [createTimestamp, tag] = splitN(data, " ", 1); - return Model.removeTag(createTimestamp, tag); + return model.removeTag(createTimestamp, tag); } }, @@ -241,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}`); }, @@ -273,6 +326,11 @@ enum CommitOrAbort { Abort, } +interface TagFilter { + description: string; + include: (task: Element) => boolean; +} + function BrowserUI() { const viewColors: { [key: string]: string } = { all: "Gold", @@ -280,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 = ""; @@ -319,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; @@ -345,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); } }, @@ -356,8 +446,8 @@ function BrowserUI() { input.removeEventListener("blur", this.completeTagEdit); task.removeChild(input); task.focus(); - if (resolution === CommitOrAbort.Commit && !newTagName.match(/^ *$/) && !Model.hasTag(task, newTagName)) { - ui.addTag(task.getAttribute("data-created")!, newTagName); + if (resolution === CommitOrAbort.Commit && !newTagName.match(/^ *$/) && !model.hasTag(task, newTagName)) { + ui.addTag(task.getAttribute("id")!, newTagName); lastTagNameEntered = newTagName; } }, @@ -377,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; }, @@ -437,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(); }, @@ -456,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) { @@ -483,16 +578,17 @@ 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"); if (task.parentElement !== taskList) { - Model.insertInPriorityOrder(task, taskList); + model.insertInPriorityOrder(task, taskList); } } }, @@ -512,15 +608,15 @@ 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 ? clock.now() : Model.getPriority(a); - const bPriority = b === null ? 0 : Model.getPriority(b); + 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; - 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(); }, @@ -529,28 +625,22 @@ 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)) { - tasksWithTag.set(task.getElementsByClassName("desc")[0].textContent, [Model.getPriority(task), task]); + if (filter.include(task)) { + tasksWithTag.set(task.getElementsByClassName("desc")[0].textContent, [model.getPriority(task), task]); } } @@ -568,19 +658,33 @@ 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); if (superTask !== null) { - Model.insertInPriorityOrder(task, superTask); + model.insertInPriorityOrder(task, superTask); } else { task.classList.add("hide"); } } } - 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) { @@ -594,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 () { @@ -636,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(); @@ -666,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); @@ -675,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); @@ -688,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"); @@ -700,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"); @@ -709,6 +819,7 @@ function handleKey(event: any) { function browserInit() { log.replay(); + browserUI.setTitle(); browserUI.firstVisibleTask()?.focus(); document.body.addEventListener("keydown", handleKey, { capture: false }); }