task.setAttribute("tabindex", "0");
task.setAttribute("data-created", timestamp);
task.setAttribute("data-state", "todo");
- document.getElementById("tasks")!.appendChild(task);
+ const tasks = document.getElementById("tasks")!;
+ tasks.insertBefore(task, tasks.firstElementChild);
return task;
},
if (!target) return null;
target.setAttribute("data-priority", `${priority}`);
for (const task of document.getElementsByClassName("task")) {
- if (task !== target && this.getPriority(task) > priority) {
+ if (task !== target && this.getPriority(task) < priority) {
task.parentElement!.insertBefore(target, task);
return target;
}
}
function BrowserUI() {
+ const viewColors: { [key: string]: string } = {
+ all: "Gold",
+ cancelled: "Red",
+ deleted: "Black",
+ done: "LawnGreen",
+ "someday-maybe": "DeepSkyBlue",
+ todo: "White",
+ waiting: "MediumOrchid",
+ };
var currentViewState = "todo";
var taskFocusedBeforeJumpingToInput: HTMLElement | null = null;
var lastTagNameEntered = "";
}
input.value = "";
if (event.getModifierState("Control")) {
- this.makeTopPriority(task);
+ this.makeBottomPriority(task);
}
},
beginEdit: function (event: Event) {
- const task = document.activeElement;
+ var task = document.activeElement;
if (!task) return;
+ if (task.classList.contains("tag")) task = task.parentElement!;
const input = document.createElement("input");
const desc = task.getElementsByClassName("desc")[0];
const oldDescription = desc.textContent!;
}
},
+ currentTag: function (): Element | null {
+ var target = document.activeElement;
+ if (!target) return null;
+ if (target.classList.contains("task")) {
+ const tags = target.getElementsByClassName("tag");
+ target = tags[tags.length - 1];
+ }
+ if (!target || !target.classList.contains("tag")) return null;
+ return target;
+ },
+
firstVisibleTask: function () {
for (const task of document.getElementsByClassName("task")) {
const state = task.getAttribute("data-state");
taskFocusedBeforeJumpingToInput = document.activeElement;
}
document.getElementById("taskName")!.focus();
+ window.scroll(0, 0);
event.preventDefault();
},
return valid_cursor;
},
+ jumpCursor: function (position: number) {
+ const first = this.firstVisibleTask();
+ if (!first) return;
+ const dest = this.visibleTaskAtOffset(first, position - 1);
+ if (dest instanceof HTMLElement) dest.focus();
+ },
+
+ makeBottomPriority: function (task: Element | null = null) {
+ if (!task) task = document.activeElement;
+ if (!task) return;
+ this.setPriority(task, document.getElementById("tasks")!.lastElementChild, null);
+ },
+
makeTopPriority: function (task: Element | null = null) {
if (!task) task = document.activeElement;
if (!task) return;
- this.setPriority(task, null, document.getElementsByClassName("task")[0]);
+ ui.setPriority(task.getAttribute("data-created")!, clock.now(), Model.getPriority(task));
+ task instanceof HTMLElement && task.focus();
},
moveCursor: function (offset: number): boolean {
},
removeTag: function () {
- var target = document.activeElement;
+ const target = this.currentTag();
if (!target) return;
- if (target.classList.contains("task")) {
- const tags = target.getElementsByClassName("tag");
- target = tags[tags.length - 1];
- }
- if (!target || !target.classList.contains("tag")) return;
ui.removeTag(target.parentElement!.getAttribute("data-created")!, target.textContent!);
},
// 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);
- const bPriority = b === null ? clock.now() : Model.getPriority(b);
- console.assert(aPriority < bPriority, aPriority, "<", bPriority);
- const span = bPriority - aPriority;
- const newPriority = aPriority + 0.1 * span + 0.8 * span * Math.random();
- console.assert(aPriority < newPriority && newPriority < bPriority, aPriority, "<", newPriority, "<", bPriority);
+ const aPriority = a === null ? clock.now() : Model.getPriority(a);
+ const bPriority = b === null ? 0 : Model.getPriority(b);
+ console.assert(aPriority > bPriority, aPriority, ">", bPriority);
+ const span = aPriority - bPriority;
+ const newPriority = bPriority + 0.1 * span + 0.8 * span * Math.random();
+ console.assert(aPriority > newPriority && newPriority > bPriority, aPriority, ">", newPriority, ">", bPriority);
const newPriorityRounded = Math.round(newPriority);
- const okToRound = aPriority < newPriorityRounded && newPriorityRounded < bPriority;
+ const okToRound = aPriority > newPriorityRounded && newPriorityRounded > bPriority;
ui.setPriority(task.getAttribute("data-created")!, okToRound ? newPriorityRounded : newPriority, Model.getPriority(task));
task instanceof HTMLElement && task.focus();
},
return ui.setState(createTimestamp, newState, oldState);
},
- setView: function (state: string, color: string) {
+ setView: function (state: string) {
const sheet = (document.getElementById("viewStyle") as HTMLStyleElement).sheet!;
if (state === "all") {
sheet.insertRule(`.task[data-state=deleted] { display: none }`);
} else {
sheet.insertRule(`.task:not([data-state=${state}]) { display: none }`);
}
- sheet.insertRule(`:root { --view-state-indicator-color: ${color}; }`);
+ sheet.insertRule(`:root { --view-state-indicator-color: ${viewColors[state]}; }`);
sheet.removeRule(2);
sheet.removeRule(2);
currentViewState = state;
}
const browserUI = BrowserUI();
+const scrollIncrement = 60;
enum InputState {
Root,
S,
return (inputCount = (inputCount ?? 0) * 10 + parseInt(event.key));
}
try {
- if (event.key == "j") return browserUI.moveCursor(inputCount ?? 1);
- if (event.key == "k") return browserUI.moveCursor(-(inputCount ?? 1));
- if (event.key == "J") return browserUI.moveTask(inputCount ?? 1);
- if (event.key == "K") return browserUI.moveTask(-(inputCount ?? 1));
- if (event.key == "T") return browserUI.makeTopPriority();
- 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 (inputState = InputState.S);
- if (event.key == "w") return browserUI.setState("waiting");
- if (event.key == "X") return browserUI.setState("deleted");
- 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.beginEdit(event);
- if (event.key == "t") return browserUI.beginTagEdit(event);
- if (event.key == "v") return (inputState = InputState.V);
+ if (event.ctrlKey) {
+ if (event.key == "e") return window.scrollBy(0, (inputCount ?? 1) * scrollIncrement);
+ if (event.key == "y") return window.scrollBy(0, (inputCount ?? 1) * -scrollIncrement);
+ } else {
+ if (event.key == "j") return browserUI.moveCursor(inputCount ?? 1);
+ if (event.key == "k") return browserUI.moveCursor(-(inputCount ?? 1));
+ if (event.key == "J") return browserUI.moveTask(inputCount ?? 1);
+ if (event.key == "K") return browserUI.moveTask(-(inputCount ?? 1));
+ if (event.key == "G") return browserUI.jumpCursor(inputCount ?? MAX_SAFE_INTEGER);
+ if (event.key == "T") return browserUI.makeTopPriority();
+ 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 (inputState = InputState.S);
+ if (event.key == "w") return browserUI.setState("waiting");
+ if (event.key == "X") return browserUI.setState("deleted");
+ 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.beginEdit(event);
+ if (event.key == "t") return browserUI.beginTagEdit(event);
+ if (event.key == "v") return (inputState = InputState.V);
+ }
} finally {
inputCount = null;
}
if (event.key == "m") return browserUI.setState("someday-maybe");
} else if (inputState === InputState.V) {
inputState = InputState.Root;
- if (event.key == "a") return browserUI.setView("all", "Gold");
- if (event.key == "c") return browserUI.setView("cancelled", "Red");
- if (event.key == "d") return browserUI.setView("done", "LawnGreen");
- if (event.key == "q") return browserUI.setView("todo", "White");
+ if (event.key == "a") return browserUI.setView("all");
+ 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 (inputState = InputState.VS);
- if (event.key == "v") return browserUI.setView("todo", "White");
- if (event.key == "w") return browserUI.setView("waiting", "MediumOrchid");
- if (event.key == "x") return browserUI.setView("deleted", "Black");
+ if (event.key == "v") return browserUI.setView("todo");
+ if (event.key == "w") return browserUI.setView("waiting");
+ if (event.key == "x") return browserUI.setView("deleted");
} else if (inputState === InputState.VS) {
inputState = InputState.Root;
- if (event.key == "m") return browserUI.setView("someday-maybe", "DeepSkyBlue");
+ if (event.key == "m") return browserUI.setView("someday-maybe");
}
}
}
projects / vopamoi / blobdiff