From b9f7e98914ca882508950ec54e27d78a11f5179e Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Mon, 21 Mar 2022 13:02:19 -0700 Subject: [PATCH 1/1] A space for extra notes for each task --- vopamoi.css | 11 ++++++++ vopamoi.ts | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 86 insertions(+), 1 deletion(-) diff --git a/vopamoi.css b/vopamoi.css index 13ac4a9..95a0100 100644 --- a/vopamoi.css +++ b/vopamoi.css @@ -15,6 +15,17 @@ input.tag { width: 7em; border: none; } +.content { + font-size: 80%; +} +.content, textarea { + margin-left: 2em; + color: #555; +} +textarea { + width: 90%; + height: 5em; +} .hide { display: none; } diff --git a/vopamoi.ts b/vopamoi.ts index 962add7..0389a04 100644 --- a/vopamoi.ts +++ b/vopamoi.ts @@ -97,6 +97,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) { @@ -178,6 +209,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)); @@ -240,6 +275,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}`); }, @@ -318,6 +356,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,6 +401,23 @@ function BrowserUI() { } }, + 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); + } + }, + completeTagEdit: function (event: Event, resolution: CommitOrAbort = CommitOrAbort.Commit) { const input = event.target as HTMLInputElement; const task = input.parentElement!; @@ -635,7 +705,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(); @@ -674,6 +747,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); -- 2.44.1