From b56a37d31873fa82e6196cde9479b689a14e4629 Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Thu, 27 Jan 2022 00:07:27 -0800 Subject: [PATCH 1/1] undoLog is private to the UI --- vopamoi.ts | 63 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 33 insertions(+), 30 deletions(-) diff --git a/vopamoi.ts b/vopamoi.ts index 3c59226..a3b7824 100644 --- a/vopamoi.ts +++ b/vopamoi.ts @@ -149,32 +149,35 @@ function Log(prefix: string = "vp-") { } const log = Log(); -const undoLog: string[] = []; -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()}`); - } - }, -}; +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}`); + }, + 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(); function BrowserUI() { var currentViewState = "todo"; @@ -182,7 +185,7 @@ function BrowserUI() { addTask: function (event: KeyboardEvent) { const input = document.getElementById("taskName"); if (input.value) { - const task = UI.addTask(input.value); + const task = ui.addTask(input.value); if (task && task instanceof HTMLElement) task.focus(); input.value = ""; if (event.getModifierState("Control")) { @@ -218,7 +221,7 @@ function BrowserUI() { if (newDescription === oldDescription) { task.textContent = oldDescription; } else { - UI.edit(task.getAttribute("data-created")!, newDescription, oldDescription); + ui.edit(task.getAttribute("data-created")!, newDescription, oldDescription); } }, @@ -286,7 +289,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 +300,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 +314,7 @@ function BrowserUI() { }, undo: function () { - const ret = UI.undo(); + const ret = ui.undo(); if (ret && ret instanceof HTMLElement) ret.focus(); }, }; -- 2.44.1