X-Git-Url: http://git.scottworley.com/vopamoi/blobdiff_plain/868667c1142d78afe4955a6f394e9cb661eedc54..634868c9a2d36621da56cc6be8a863b5e90db941:/vopamoi.ts?ds=inline diff --git a/vopamoi.ts b/vopamoi.ts index 3c59226..d0f4fa1 100644 --- a/vopamoi.ts +++ b/vopamoi.ts @@ -33,7 +33,7 @@ const Model = { addTask: function (timestamp: string, description: string): Element { const task = document.createElement("div"); task.appendChild(document.createTextNode(description)); - task.setAttribute("class", "task"); + task.classList.add("task"); task.setAttribute("tabindex", "0"); task.setAttribute("data-created", timestamp); task.setAttribute("data-state", "todo"); @@ -41,20 +41,32 @@ const Model = { 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"); + task.appendChild(tag); + 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.children[0] as HTMLInputElement; + const input = target.firstChild as HTMLInputElement; if ( input.value === target.getAttribute("data-description") && - input.selectionStart === 0 && + 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; - input.select(); } else { // No great options. // Prefer not to interrupt the local user's edit. @@ -67,6 +79,15 @@ const Model = { return target; }, + hasTag: function (task: Element, tag: string): Element | null { + for (const child of task.children) { + if (child.classList.contains("tag") && child.textContent === tag) { + return child; + } + } + return null; + }, + getPriority: function (task: Element): number { if (task.hasAttribute("data-priority")) { return parseFloat(task.getAttribute("data-priority")!); @@ -116,13 +137,17 @@ function Log(prefix: string = "vp-") { const [createTimestamp, description] = splitN(data, " ", 1); return Model.edit(createTimestamp, description); } + if (command == "Priority") { + const [createTimestamp, newPriority] = splitN(data, " ", 1); + return Model.setPriority(createTimestamp, parseFloat(newPriority)); + } if (command == "State") { const [createTimestamp, state] = splitN(data, " ", 1); return Model.setState(timestamp, createTimestamp, state); } - if (command == "Priority") { - const [createTimestamp, newPriority] = splitN(data, " ", 1); - return Model.setPriority(createTimestamp, parseFloat(newPriority)); + if (command == "Tag") { + const [createTimestamp, tag] = splitN(data, " ", 1); + return Model.addTag(createTimestamp, tag); } }, @@ -149,41 +174,59 @@ function Log(prefix: string = "vp-") { } const log = Log(); -const undoLog: string[] = []; +function UI() { + const undoLog: string[] = []; + return { + addTask: function (description: string): Element { + const now = clock.now(); + 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}`); + }, + setPriority: function (createTimestamp: string, newPriority: number, oldPriority: number) { + undoLog.push(`Priority ${createTimestamp} ${oldPriority}`); + return log.recordAndApply(`${clock.now()} Priority ${createTimestamp} ${newPriority}`); + }, + setState: function (createTimestamp: string, newState: string, oldState: string) { + undoLog.push(`State ${createTimestamp} ${oldState}`); + return log.recordAndApply(`${clock.now()} State ${createTimestamp} ${newState}`); + }, + undo: function () { + if (undoLog.length > 0) { + return log.recordAndApply(`${clock.now()} ${undoLog.pop()}`); + } + }, + }; +} +const ui = UI(); -const UI = { - addTask: function (description: string): Element { - const now = clock.now(); - undoLog.push(`State ${now} deleted`); - return log.recordAndApply(`${now} Create ${description}`); - }, - edit: function (createTimestamp: string, newDescription: string, oldDescription: string) { - undoLog.push(`Edit ${createTimestamp} ${oldDescription}`); - return log.recordAndApply(`${clock.now()} Edit ${createTimestamp} ${newDescription}`); - }, - setPriority: function (createTimestamp: string, newPriority: number, oldPriority: number) { - undoLog.push(`Priority ${createTimestamp} ${oldPriority}`); - return log.recordAndApply(`${clock.now()} Priority ${createTimestamp} ${newPriority}`); - }, - setState: function (createTimestamp: string, newState: string, oldState: string) { - undoLog.push(`State ${createTimestamp} ${oldState}`); - return log.recordAndApply(`${clock.now()} State ${createTimestamp} ${newState}`); - }, - undo: function () { - if (undoLog.length > 0) { - return log.recordAndApply(`${clock.now()} ${undoLog.pop()}`); - } - }, -}; +enum CommitOrAbort { + Commit, + Abort, +} function BrowserUI() { var currentViewState = "todo"; + var taskFocusedBeforeJumpingToInput: HTMLElement | null = null; + var lastTagNameEntered = ""; return { addTask: function (event: KeyboardEvent) { const input = document.getElementById("taskName"); if (input.value) { - const task = UI.addTask(input.value); - if (task && task instanceof HTMLElement) task.focus(); + const task = ui.addTask(input.value); + if (currentViewState === "todo") { + task instanceof HTMLElement && task.focus(); + } else if (this.returnFocusAfterInput()) { + } else { + this.firstVisibleTask()?.focus(); + } input.value = ""; if (event.getModifierState("Control")) { this.setPriority(task, null, document.getElementsByClassName("task")[0]); @@ -200,25 +243,50 @@ 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 }); + input.value = lastTagNameEntered; task.appendChild(input); input.focus(); input.select(); event.preventDefault(); }, - completeEdit: function (event: Event) { + completeEdit: function (event: Event, resolution: CommitOrAbort = CommitOrAbort.Commit) { const input = event.target as HTMLInputElement; const task = input.parentElement!; const oldDescription = task.getAttribute("data-description")!; const newDescription = input.value; input.removeEventListener("blur", this.completeEdit); - task.removeChild(task.children[0]); + task.removeChild(input); task.removeAttribute("data-description"); task.focus(); - if (newDescription === oldDescription) { + if (newDescription === oldDescription || resolution === CommitOrAbort.Abort) { task.textContent = oldDescription; } else { - UI.edit(task.getAttribute("data-created")!, newDescription, oldDescription); + ui.edit(task.getAttribute("data-created")!, newDescription, oldDescription); + } + }, + + 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(); + if (resolution === CommitOrAbort.Commit && newTagName && !Model.hasTag(task, newTagName)) { + ui.addTag(task.getAttribute("data-created")!, newTagName); + lastTagNameEntered = newTagName; } }, @@ -231,6 +299,9 @@ function BrowserUI() { }, focusTaskNameInput: function (event: Event) { + if (document.activeElement instanceof HTMLElement) { + taskFocusedBeforeJumpingToInput = document.activeElement; + } document.getElementById("taskName")!.focus(); event.preventDefault(); }, @@ -276,6 +347,14 @@ function BrowserUI() { } }, + returnFocusAfterInput: function (): boolean { + if (taskFocusedBeforeJumpingToInput) { + taskFocusedBeforeJumpingToInput.focus(); + return true; + } + return false; + }, + // 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 ? 0 : Model.getPriority(a); @@ -286,7 +365,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("data-created")!, okToRound ? newPriorityRounded : newPriority, Model.getPriority(task)); task instanceof HTMLElement && task.focus(); }, @@ -297,7 +376,7 @@ function BrowserUI() { if (newState === oldState) return; const createTimestamp = task.getAttribute("data-created")!; this.moveCursor(1) || this.moveCursor(-1); - return UI.setState(createTimestamp, newState, oldState); + return ui.setState(createTimestamp, newState, oldState); }, setView: function (state: string) { @@ -311,7 +390,7 @@ function BrowserUI() { }, undo: function () { - const ret = UI.undo(); + const ret = ui.undo(); if (ret && ret instanceof HTMLElement) ret.focus(); }, }; @@ -328,8 +407,13 @@ function handleKey(event: any) { 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(); + } 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); } } else { if (inputState === InputState.Command) { @@ -340,19 +424,20 @@ function handleKey(event: any) { if (event.key == "n") return browserUI.focusTaskNameInput(event); 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 browserUI.setState("someday-maybe"); - if (event.key == "t") return browserUI.setState("todo"); if (event.key == "w") return browserUI.setState("waiting"); 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; if (event.key == "c") return browserUI.setView("cancelled"); if (event.key == "d") return browserUI.setView("done"); + if (event.key == "q") return browserUI.setView("todo"); if (event.key == "s") return browserUI.setView("someday-maybe"); - if (event.key == "t") return browserUI.setView("todo"); if (event.key == "w") return browserUI.setView("waiting"); if (event.key == "x") return browserUI.setView("deleted"); }