From: Scott Worley Date: Wed, 26 Jan 2022 22:46:28 +0000 (-0800) Subject: Undo for task creation and reordering X-Git-Url: http://git.scottworley.com/vopamoi/commitdiff_plain/43f3cc0cb1e4b64b0560ca8d722754cf6ebb1b8d?ds=sidebyside Undo for task creation and reordering --- diff --git a/vopamoi.ts b/vopamoi.ts index 5e645b8..a88408f 100644 --- a/vopamoi.ts +++ b/vopamoi.ts @@ -40,19 +40,20 @@ const Model = { } }, - setPriority: function (createTimestamp: string, priority: number) { + setPriority: function (createTimestamp: string, priority: number): Element | null { const target = this.getTask(createTimestamp); - if (!target) return; + if (!target) return null; target.setAttribute("data-priority", `${priority}`); for (const task of document.getElementsByClassName("task")) { if (task !== target && this.getPriority(task) > priority) { task.parentElement!.insertBefore(target, task); target instanceof HTMLElement && target.focus(); - return; + return target; } } document.getElementById("tasks")!.appendChild(target); target instanceof HTMLElement && target.focus(); + return target; }, setState: function (stateTimestamp: string, createTimestamp: string, state: string) { @@ -107,16 +108,26 @@ function Log(prefix: string = "vp-") { } const log = Log(); +const undoLog: string[] = []; + const UI = { addTask: function (description: string): Element { - return log.recordAndApply(`${Date.now()} Create ${description}`); + const now = Date.now(); + undoLog.push(`State ${now} deleted`); + return log.recordAndApply(`${now} Create ${description}`); }, - setPriority: function (createTimestamp: string, priority: number) { - return log.recordAndApply(`${Date.now()} Priority ${createTimestamp} ${priority}`); + setPriority: function (createTimestamp: string, newPriority: number, oldPriority: number) { + undoLog.push(`Priority ${createTimestamp} ${oldPriority}`); + return log.recordAndApply(`${Date.now()} Priority ${createTimestamp} ${newPriority}`); }, setState: function (createTimestamp: string, state: string) { return log.recordAndApply(`${Date.now()} State ${createTimestamp} ${state}`); }, + undo: function () { + if (undoLog.length > 0) { + return log.recordAndApply(`${Date.now()} ${undoLog.pop()}`); + } + }, }; const BrowserUI = { @@ -195,7 +206,7 @@ const 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); + UI.setPriority(task.getAttribute("data-created")!, okToRound ? newPriorityRounded : newPriority, Model.getPriority(task)); }, setState: function (state: string) { @@ -203,6 +214,11 @@ const BrowserUI = { this.moveCursor(1) || this.moveCursor(-1); return UI.setState(createTimestamp!, state); }, + + undo: function () { + const ret = UI.undo(); + if (ret && ret instanceof HTMLElement) ret.focus(); + }, }; function handleKey(event: any) { @@ -219,6 +235,7 @@ function handleKey(event: any) { if (event.key == "d") return BrowserUI.setState("done"); if (event.key == "c") return BrowserUI.setState("cancelled"); if (event.key == "X") return BrowserUI.setState("deleted"); + if (event.key == "u") return BrowserUI.undo(); } }