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");
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;
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.
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);
}
},
}
const log = Log();
-
function UI() {
const undoLog: string[] = [];
return {
undoLog.push(`State ${now} deleted`);
return <Element>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}`);
}
const ui = UI();
+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();
+ 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]);
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();
- 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);
}
},
+ 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) {
},
focusTaskNameInput: function (event: Event) {
+ if (document.activeElement instanceof HTMLElement) {
+ taskFocusedBeforeJumpingToInput = document.activeElement;
+ }
document.getElementById("taskName")!.focus();
event.preventDefault();
},
}
},
+ 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);
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) {
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");
}
projects / vopamoi / blobdiff