}
},
+ removeTag: function (createTimestamp: string, tagName: string) {
+ const task = this.getTask(createTimestamp);
+ if (!task) return null;
+ const tag = this.hasTag(task, tagName);
+ if (!tag) return;
+ task.removeChild(tag);
+ if (task instanceof HTMLElement) task.focus();
+ },
+
setPriority: function (createTimestamp: string, priority: number): Element | null {
const target = this.getTask(createTimestamp);
if (!target) return null;
const [createTimestamp, tag] = splitN(data, " ", 1);
return Model.addTag(createTimestamp, tag);
}
+ if (command == "Untag") {
+ const [createTimestamp, tag] = splitN(data, " ", 1);
+ return Model.removeTag(createTimestamp, tag);
+ }
},
record: function (entry: string) {
return <Element>log.recordAndApply(`${now} Create ${description}`);
},
addTag: function (createTimestamp: string, tag: string) {
- // TODO: undo
+ undoLog.push(`Untag ${createTimestamp} ${tag}`);
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}`);
},
+ removeTag: function (createTimestamp: string, tag: string) {
+ undoLog.push(`Tag ${createTimestamp} ${tag}`);
+ return log.recordAndApply(`${clock.now()} Untag ${createTimestamp} ${tag}`);
+ },
setPriority: function (createTimestamp: string, newPriority: number, oldPriority: number) {
undoLog.push(`Priority ${createTimestamp} ${oldPriority}`);
return log.recordAndApply(`${clock.now()} Priority ${createTimestamp} ${newPriority}`);
return {
addTask: function (event: KeyboardEvent) {
const input = <HTMLInputElement>document.getElementById("taskName");
- if (input.value) {
- 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]);
- }
+ if (input.value.match(/^ *$/)) return;
+ 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.makeTopPriority(task);
}
},
task.removeChild(input);
task.removeAttribute("data-description");
task.focus();
- if (newDescription === oldDescription || resolution === CommitOrAbort.Abort) {
+ if (resolution === CommitOrAbort.Abort || newDescription.match(/^ *$/) || newDescription === oldDescription) {
desc.textContent = oldDescription;
} else {
ui.edit(task.getAttribute("data-created")!, newDescription, oldDescription);
input.removeEventListener("blur", this.completeTagEdit);
task.removeChild(input);
task.focus();
- if (resolution === CommitOrAbort.Commit && newTagName && !Model.hasTag(task, newTagName)) {
+ if (resolution === CommitOrAbort.Commit && !newTagName.match(/^ *$/) && !Model.hasTag(task, newTagName)) {
ui.addTag(task.getAttribute("data-created")!, newTagName);
lastTagNameEntered = newTagName;
}
return valid_cursor;
},
+ makeTopPriority: function (task: Element | null = null) {
+ if (!task) task = document.activeElement;
+ if (!task) return;
+ this.setPriority(task, null, document.getElementsByClassName("task")[0]);
+ },
+
moveCursor: function (offset: number): boolean {
const active = document.activeElement;
if (!active) return false;
}
},
+ removeTag: function () {
+ var target = document.activeElement;
+ 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!);
+ },
+
returnFocusAfterInput: function (): boolean {
if (taskFocusedBeforeJumpingToInput) {
taskFocusedBeforeJumpingToInput.focus();
return ui.setState(createTimestamp, newState, oldState);
},
- setView: function (state: string) {
+ setView: function (state: string, color: string) {
const sheet = (document.getElementById("viewStyle") as HTMLStyleElement).sheet!;
sheet.insertRule(`.task:not([data-state=${state}]) { display: none }`);
- sheet.removeRule(1);
+ sheet.insertRule(`:root { --view-state-indicator-color: ${color}; }`);
+ sheet.removeRule(2);
+ sheet.removeRule(2);
currentViewState = state;
if (document.activeElement?.getAttribute("data-state") !== state) {
this.firstVisibleTask()?.focus();
const browserUI = BrowserUI();
enum InputState {
- Command,
- View,
+ Root,
+ S,
+ V,
+ VS,
}
-var inputState = InputState.Command;
+var inputState = InputState.Root;
function handleKey(event: any) {
if (event.target.tagName === "INPUT") {
if (event.key == "Escape") return browserUI.completeEdit(event, CommitOrAbort.Abort);
}
} else {
- if (inputState === InputState.Command) {
+ if (inputState === InputState.Root) {
if (event.key == "j") return browserUI.moveCursor(1);
if (event.key == "k") return browserUI.moveCursor(-1);
if (event.key == "J") return browserUI.moveTask(1);
if (event.key == "K") return browserUI.moveTask(-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 browserUI.setState("someday-maybe");
+ 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 == "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 == "w") return browserUI.setView("waiting");
- if (event.key == "x") return browserUI.setView("deleted");
+ if (event.key == "v") return (inputState = InputState.V);
+ } else if (inputState === InputState.S) {
+ inputState = InputState.Root;
+ if (event.key == "m") return browserUI.setState("someday-maybe");
+ } else if (inputState === InputState.V) {
+ inputState = InputState.Root;
+ 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 == "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");
+ } else if (inputState === InputState.VS) {
+ inputState = InputState.Root;
+ if (event.key == "m") return browserUI.setView("someday-maybe", "DeepSkyBlue");
}
}
}
function browserInit() {
- document.body.addEventListener("keydown", handleKey, { capture: false });
log.replay();
browserUI.firstVisibleTask()?.focus();
+ document.body.addEventListener("keydown", handleKey, { capture: false });
}
projects / vopamoi / blobdiff