From: Scott Worley Date: Thu, 27 Jan 2022 19:57:00 +0000 (-0800) Subject: Add tags X-Git-Url: http://git.scottworley.com/vopamoi/commitdiff_plain/7b5b90b9a161fdeeb9842029a369d0484146ef4d?ds=sidebyside;hp=132921e6693ae5492fded334a12c66b82f4b79f9 Add tags --- diff --git a/vopamoi.css b/vopamoi.css index d8365cb..814de51 100644 --- a/vopamoi.css +++ b/vopamoi.css @@ -1,3 +1,10 @@ input { width: calc(100% - 8px); /* 8px to account for the default padding and border */ } +.tag { + float: right; + margin-left: 1em; +} +input.tag { + width: 7em; +} diff --git a/vopamoi.ts b/vopamoi.ts index 8112c4f..5ac82ef 100644 --- a/vopamoi.ts +++ b/vopamoi.ts @@ -41,6 +41,17 @@ const Model = { return task; }, + addTag: function (createTimestamp: string, tagName: string): Element | null { + const task = this.getTask(createTimestamp); + if (!task) return null; + const tag = document.createElement("span"); + tag.appendChild(document.createTextNode(tagName)); + tag.classList.add("tag"); + tag.setAttribute("tabindex", "0"); + task.appendChild(tag); + return tag; + }, + edit: function (createTimestamp: string, newDescription: string): Element | null { const target = this.getTask(createTimestamp); if (!target) return null; @@ -123,6 +134,10 @@ function Log(prefix: string = "vp-") { const [createTimestamp, state] = splitN(data, " ", 1); return Model.setState(timestamp, createTimestamp, state); } + if (command == "Tag") { + const [createTimestamp, tag] = splitN(data, " ", 1); + return Model.addTag(createTimestamp, tag); + } }, record: function (entry: string) { @@ -156,6 +171,10 @@ function UI() { undoLog.push(`State ${now} deleted`); return log.recordAndApply(`${now} Create ${description}`); }, + addTag: function (createTimestamp: string, tag: string) { + // TODO: undo + return log.recordAndApply(`${clock.now()} Tag ${createTimestamp} ${tag}`); + }, edit: function (createTimestamp: string, newDescription: string, oldDescription: string) { undoLog.push(`Edit ${createTimestamp} ${oldDescription}`); return log.recordAndApply(`${clock.now()} Edit ${createTimestamp} ${newDescription}`); @@ -212,6 +231,17 @@ function BrowserUI() { input.value = oldDescription; input.addEventListener("blur", this.completeEdit, { once: true }); task.textContent = ""; + task.insertBefore(input, task.firstChild); + input.focus(); + event.preventDefault(); + }, + + beginTagEdit: function (event: Event) { + const task = document.activeElement; + if (!task) return; + const input = document.createElement("input"); + input.classList.add("tag"); + input.addEventListener("blur", this.completeTagEdit, { once: true }); task.appendChild(input); input.focus(); event.preventDefault(); @@ -233,6 +263,16 @@ function BrowserUI() { } }, + completeTagEdit: function (event: Event, resolution: CommitOrAbort = CommitOrAbort.Commit) { + const input = event.target as HTMLInputElement; + const task = input.parentElement!; + const newTagName = input.value; + input.removeEventListener("blur", this.completeTagEdit); + task.removeChild(input); + task.focus(); + ui.addTag(task.getAttribute("data-created")!, newTagName); + }, + firstVisibleTask: function () { for (const task of document.getElementsByClassName("task")) { if (task instanceof HTMLElement && task.getAttribute("data-state") === currentViewState) { @@ -351,6 +391,9 @@ function handleKey(event: any) { if (event.target.id === "taskName") { if (event.key == "Enter") return browserUI.addTask(event); if (event.key == "Escape") return browserUI.returnFocusAfterInput(); + } else if (event.target.classList.contains("tag")) { + if (event.key == "Enter") return browserUI.completeTagEdit(event); + if (event.key == "Escape") return browserUI.completeTagEdit(event, CommitOrAbort.Abort); } else { if (event.key == "Enter") return browserUI.completeEdit(event); if (event.key == "Escape") return browserUI.completeEdit(event, CommitOrAbort.Abort); @@ -370,6 +413,7 @@ function handleKey(event: any) { if (event.key == "X") return browserUI.setState("deleted"); if (event.key == "u") return browserUI.undo(); if (event.key == "e") return browserUI.beginEdit(event); + if (event.key == "t") return browserUI.beginTagEdit(event); if (event.key == "v") return (inputState = InputState.View); } else if (inputState === InputState.View) { inputState = InputState.Command;