}
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 <Element>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();
-const UI = {
- addTask: function (description: string): Element {
- const now = clock.now();
- undoLog.push(`State ${now} deleted`);
- return <Element>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;
return {
addTask: function (event: KeyboardEvent) {
const input = <HTMLInputElement>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]);
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")!;
task.removeChild(task.children[0]);
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);
}
},
firstVisibleTask: function () {
for (const task of document.getElementsByClassName("task")) {
- if (task instanceof HTMLElement && task.getAttribute("data-state")! === "todo") {
+ if (task instanceof HTMLElement && task.getAttribute("data-state") === currentViewState) {
return task;
}
}
},
focusTaskNameInput: function (event: Event) {
+ if (document.activeElement instanceof HTMLElement) {
+ taskFocusedBeforeJumpingToInput = document.activeElement;
+ }
document.getElementById("taskName")!.focus();
event.preventDefault();
},
while (true) {
cursor = increment > 0 ? cursor.nextElementSibling : cursor.previousElementSibling;
if (!cursor || !(cursor instanceof HTMLElement)) break;
- if (cursor.getAttribute("data-state")! === "todo") {
+ if (cursor.getAttribute("data-state")! === currentViewState) {
offset -= increment;
valid_cursor = cursor;
}
}
},
+ 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);
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();
},
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) {
+ const sheet = (document.getElementById("viewStyle") as HTMLStyleElement).sheet!;
+ sheet.insertRule(`.task:not([data-state=${state}]) { display: none }`);
+ sheet.removeRule(1);
+ currentViewState = state;
+ if (document.activeElement?.getAttribute("data-state") !== state) {
+ this.firstVisibleTask()?.focus();
+ }
},
undo: function () {
- const ret = UI.undo();
+ const ret = ui.undo();
if (ret && ret instanceof HTMLElement) ret.focus();
},
};
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.key == "Enter") return browserUI.completeEdit(event);
+ if (event.key == "Escape") return browserUI.completeEdit(event, CommitOrAbort.Abort);
}
} else {
if (inputState === InputState.Command) {
if (event.key == "J") return browserUI.moveTask(1);
if (event.key == "K") return browserUI.moveTask(-1);
if (event.key == "n") return browserUI.focusTaskNameInput(event);
- if (event.key == "s") return browserUI.setState("someday-maybe");
- if (event.key == "w") return browserUI.setState("waiting");
- if (event.key == "d") return browserUI.setState("done");
if (event.key == "c") return browserUI.setState("cancelled");
+ if (event.key == "d") return browserUI.setState("done");
+ 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 == "v") return (inputState = InputState.View);
} else if (inputState === InputState.View) {
- return (inputState = InputState.Command);
+ inputState = InputState.Command;
+ if (event.key == "c") return browserUI.setView("cancelled");
+ if (event.key == "d") return browserUI.setView("done");
+ 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");
}
}
}
projects / vopamoi / blobdiff