task.appendChild(desc);
task.classList.add("task");
task.setAttribute("tabindex", "0");
- task.setAttribute("data-created", timestamp);
+ task.setAttribute("id", timestamp);
task.setAttribute("data-state", "todo");
const tasks = document.getElementById("tasks")!;
tasks.insertBefore(task, tasks.firstElementChild);
return target;
},
+ editContent: function (createTimestamp: string, newContent: string): Element | null {
+ const target = this.getTask(createTimestamp);
+ if (!target) return null;
+ if (target.hasAttribute("data-content")) {
+ // Oh no: An edit has arrived from a replica while a local edit is in progress.
+ const input = target.getElementsByTagName("textarea")[0]!;
+ if (
+ input.value === target.getAttribute("data-content") &&
+ 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 = newContent;
+ } else {
+ // No great options.
+ // Prefer not to interrupt the local user's edit.
+ // The remote edit is mostly lost; this mostly becomes last-write-wins.
+ target.setAttribute("data-content", newContent);
+ }
+ } else {
+ var content = target.getElementsByClassName("content")[0];
+ if (!content) {
+ content = document.createElement("div");
+ content.classList.add("content");
+ target.appendChild(content);
+ }
+ content.textContent = newContent;
+ }
+ return target;
+ },
+
hasTag: function (task: Element, tag: string): Element | null {
for (const child of task.getElementsByClassName("tag")) {
if (child.textContent === tag) {
if (task.hasAttribute("data-priority")) {
return parseFloat(task.getAttribute("data-priority")!);
}
- return parseFloat(task.getAttribute("data-created")!);
+ return parseFloat(task.getAttribute("id")!);
},
getTask: function (createTimestamp: string) {
- for (const task of document.getElementsByClassName("task")) {
- if (task.getAttribute("data-created") === createTimestamp) {
- return task;
- }
- }
+ return document.getElementById(createTimestamp);
},
insertInPriorityOrder: function (task: Element, dest: Element) {
const [createTimestamp, description] = splitN(data, " ", 1);
return model.edit(createTimestamp, description);
}
+ if (command == "EditContent") {
+ const [createTimestamp, content] = splitN(data, " ", 1);
+ return model.editContent(createTimestamp, content);
+ }
if (command == "Priority") {
const [createTimestamp, newPriority] = splitN(data, " ", 1);
return model.setPriority(createTimestamp, parseFloat(newPriority));
edit: function (createTimestamp: string, newDescription: string, oldDescription: string) {
return perform(`Edit ${createTimestamp} ${newDescription}`, `Edit ${createTimestamp} ${oldDescription}`);
},
+ editContent: function (createTimestamp: string, newContent: string, oldContent: string) {
+ return perform(`EditContent ${createTimestamp} ${newContent}`, `EditContent ${createTimestamp} ${oldContent}`);
+ },
removeTag: function (createTimestamp: string, tag: string) {
return perform(`Untag ${createTimestamp} ${tag}`, `Tag ${createTimestamp} ${tag}`);
},
Abort,
}
+interface TagFilter {
+ description: string;
+ include: (task: Element) => boolean;
+}
+
function BrowserUI() {
const viewColors: { [key: string]: string } = {
all: "Gold",
todo: "White",
waiting: "MediumOrchid",
};
- var currentTagView: string | null = null;
+ var currentTagFilter: TagFilter | null = null;
var currentViewState = "todo";
var taskFocusedBeforeJumpingToInput: HTMLElement | null = null;
var lastTagNameEntered = "";
event.preventDefault();
},
+ beginEditContent: function (event: Event) {
+ const task = this.currentTask();
+ if (!task) return;
+ const input = document.createElement("textarea");
+ const content = task.getElementsByClassName("content")[0];
+ const oldContent = content?.textContent ?? "";
+ task.setAttribute("data-content", oldContent);
+ input.value = oldContent;
+ input.addEventListener("blur", this.completeContentEdit, { once: true });
+ if (content) content.textContent = "";
+ task.appendChild(input);
+ input.focus();
+ event.preventDefault();
+ },
+
beginTagEdit: function (event: Event) {
const task = this.currentTask();
if (!task) return;
if (resolution === CommitOrAbort.Abort || newDescription.match(/^ *$/) || newDescription === oldDescription) {
desc.textContent = oldDescription;
} else {
- ui.edit(task.getAttribute("data-created")!, newDescription, oldDescription);
+ ui.edit(task.getAttribute("id")!, newDescription, oldDescription);
+ }
+ },
+
+ completeContentEdit: function (event: Event, resolution: CommitOrAbort = CommitOrAbort.Commit) {
+ const input = event.target as HTMLInputElement;
+ const task = input.parentElement!;
+ const content = task.getElementsByClassName("content")[0];
+ const oldContent = task.getAttribute("data-content")!;
+ const newContent = input.value;
+ input.removeEventListener("blur", this.completeContentEdit);
+ task.removeChild(input);
+ task.removeAttribute("data-content");
+ task.focus();
+ if (resolution === CommitOrAbort.Abort || newContent === oldContent) {
+ if (content) content.textContent = oldContent;
+ } else {
+ ui.editContent(task.getAttribute("id")!, newContent, oldContent);
}
},
task.removeChild(input);
task.focus();
if (resolution === CommitOrAbort.Commit && !newTagName.match(/^ *$/) && !model.hasTag(task, newTagName)) {
- ui.addTag(task.getAttribute("data-created")!, newTagName);
+ ui.addTag(task.getAttribute("id")!, newTagName);
lastTagNameEntered = newTagName;
}
},
var target = document.activeElement;
if (!target) return null;
if (target.classList.contains("tag")) target = target.parentElement!;
+ if (!target.classList.contains("task")) return null;
return target as HTMLElement;
},
makeTopPriority: function (task: Element | null = null) {
if (!task) task = this.currentTask();
if (!task) return;
- ui.setPriority(task.getAttribute("data-created")!, clock.now(), model.getPriority(task));
+ ui.setPriority(task.getAttribute("id")!, clock.now(), model.getPriority(task));
task instanceof HTMLElement && task.focus();
},
},
moveCursorVertically: function (offset: number): boolean {
- const active = this.currentTask();
+ let active = this.currentTask();
+ if (!active) {
+ this.firstVisibleTask()?.focus();
+ active = this.currentTask();
+ }
if (!active) return false;
const dest = this.visibleTaskAtOffset(active, offset);
if (dest !== active && dest instanceof HTMLElement) {
removeTag: function () {
const target = this.currentTag();
if (!target) return;
- ui.removeTag(target.parentElement!.getAttribute("data-created")!, target.textContent!);
+ ui.removeTag(target.parentElement!.getAttribute("id")!, target.textContent!);
},
resetTagView: function () {
- currentTagView = null;
+ currentTagFilter = null;
+ this.setTitle();
const taskList = document.getElementById("tasks")!;
for (const task of Array.from(document.getElementsByClassName("task"))) {
task.classList.remove("hide");
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("id")!, okToRound ? newPriorityRounded : newPriority, model.getPriority(task));
task instanceof HTMLElement && task.focus();
},
if (!task) return;
const oldState = task.getAttribute("data-state")!;
if (newState === oldState) return;
- const createTimestamp = task.getAttribute("data-created")!;
+ const createTimestamp = task.getAttribute("id")!;
if (currentViewState !== "all" || newState == "deleted") {
this.moveCursorVertically(1) || this.moveCursorVertically(-1);
}
return ui.setState(createTimestamp, newState, oldState);
},
- setTagView: function (tag: string | null = null) {
- if (tag === null) {
- const target = this.currentTag();
- if (!target) return;
- tag = target.textContent!;
- }
-
- if (currentTagView !== null) {
+ setTagFilter: function (filter: TagFilter) {
+ if (currentTagFilter !== null) {
this.resetTagView();
}
const tasksWithTag = new Map();
for (const task of document.getElementsByClassName("task")) {
- if (model.hasTag(task, tag)) {
+ if (filter.include(task)) {
tasksWithTag.set(task.getElementsByClassName("desc")[0].textContent, [model.getPriority(task), task]);
}
}
}
for (const task of Array.from(document.getElementsByClassName("task"))) {
- if (model.hasTag(task, tag)) {
+ if (filter.include(task)) {
task.classList.remove("hide");
} else {
const superTask = highestPrioritySuperTask(task);
}
}
- currentTagView = tag;
+ currentTagFilter = filter;
+ this.setTitle();
+ },
+
+ setTagView: function (tag: string | null = null) {
+ if (tag === null) {
+ const target = this.currentTag();
+ if (!target) return;
+ tag = target.textContent!;
+ }
+ this.setTagFilter({description: tag, include: task => !!model.hasTag(task, tag!)});
+ },
+
+ setTitle: function () {
+ document.title = "Vopamoi: " + currentViewState + (currentTagFilter ? ": " + currentTagFilter.description : "");
},
setView: function (state: string) {
sheet.removeRule(2);
sheet.removeRule(2);
currentViewState = state;
+ this.setTitle();
if (this.currentTask()?.getAttribute("data-state") !== state) {
this.firstVisibleTask()?.focus();
}
},
setUntaggedView: function () {
- if (currentTagView !== null) {
+ if (currentTagFilter !== null) {
this.resetTagView();
}
for (const task of document.getElementsByClassName("task")) {
function handleKey(event: any) {
if (["Alt", "Control", "Meta", "Shift"].includes(event.key)) return;
- if (event.target.tagName === "INPUT") {
+ if (event.target.tagName === "TEXTAREA") {
+ if (event.key == "Enter" && event.ctrlKey) return browserUI.completeContentEdit(event);
+ if (event.key == "Escape") return browserUI.completeContentEdit(event, CommitOrAbort.Abort);
+ } else 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();
if (event.key == "x") return browserUI.removeTag();
if (event.key == "u") return browserUI.undo();
if (event.key == "r") return browserUI.redo();
+ if (event.key == "E") return browserUI.beginEditContent(event);
if (event.key == "e") return browserUI.beginEdit(event);
if (event.key == "t") return browserUI.beginTagEdit(event);
if (event.key == "v") return (inputState = InputState.V);
function browserInit() {
log.replay();
+ browserUI.setTitle();
browserUI.firstVisibleTask()?.focus();
document.body.addEventListener("keydown", handleKey, { capture: false });
}
projects / vopamoi / blobdiff