X-Git-Url: http://git.scottworley.com/vopamoi/blobdiff_plain/01f418592aab444588d6d64d53aecf70644e45c0..5fa4704c5a919a16c0d41fe1f92eaa83d236a66b:/vopamoi.ts

diff --git a/vopamoi.ts b/vopamoi.ts
index 2b38dd8..b90b895 100644
--- a/vopamoi.ts
+++ b/vopamoi.ts
@@ -53,7 +53,7 @@ const Model = {
   },
 };
 
-const Log = (function () {
+function Log(prefix: string = "vp-") {
   var next_log_index = 0;
   return {
     apply: function (entry: string) {
@@ -71,7 +71,7 @@ const Log = (function () {
     },
 
     record: function (entry: string) {
-      window.localStorage.setItem(`${next_log_index++}`, entry);
+      window.localStorage.setItem(`${prefix}${next_log_index++}`, entry);
     },
 
     recordAndApply: function (entry: string) {
@@ -81,7 +81,7 @@ const Log = (function () {
 
     replay: function () {
       while (true) {
-        const entry = window.localStorage.getItem(`${next_log_index}`);
+        const entry = window.localStorage.getItem(`${prefix}${next_log_index}`);
         if (entry === null) {
           break;
         }
@@ -90,17 +90,18 @@ const Log = (function () {
       }
     },
   };
-})();
+}
+const log = Log();
 
 const UI = {
   addTask: function (description: string) {
-    Log.recordAndApply(`${Date.now()} Create ${description}`);
+    log.recordAndApply(`${Date.now()} Create ${description}`);
   },
   destroyTask: function (createTimestamp: string) {
-    Log.recordAndApply(`${Date.now()} Destroy ${createTimestamp} ${Model.getTask(createTimestamp)?.textContent}`);
+    log.recordAndApply(`${Date.now()} Destroy ${createTimestamp} ${Model.getTask(createTimestamp)?.textContent}`);
   },
   setState: function (createTimestamp: string, state: string) {
-    Log.recordAndApply(`${Date.now()} State ${createTimestamp} ${state}`);
+    log.recordAndApply(`${Date.now()} State ${createTimestamp} ${state}`);
   },
 };
 
@@ -125,15 +126,22 @@ const BrowserUI = {
   },
 
   moveCursor: function (offset: number): boolean {
-    var active = document.activeElement;
-    if (offset === 1 && active) {
-      active = active.nextElementSibling;
-    }
-    if (offset === -1 && active) {
-      active = active.previousElementSibling;
+    var initial_cursor = document.activeElement;
+    if (!initial_cursor) return false;
+    var cursor: Element | null = initial_cursor;
+    var valid_cursor = cursor;
+    const increment = offset / Math.abs(offset);
+    while (true) {
+      cursor = increment > 0 ? cursor.nextElementSibling : cursor.previousElementSibling;
+      if (!cursor || !(cursor instanceof HTMLElement)) break;
+      if (cursor.style.display !== "none") {
+        offset -= increment;
+        valid_cursor = cursor;
+      }
+      if (Math.abs(offset) < 0.5) break;
     }
-    if (active && active instanceof HTMLElement) {
-      active.focus();
+    if (valid_cursor !== initial_cursor && valid_cursor instanceof HTMLElement) {
+      valid_cursor.focus();
       return true;
     }
     return false;
@@ -161,5 +169,5 @@ function handleKey(event: any) {
 
 function browserInit() {
   document.body.addEventListener("keydown", handleKey, { capture: false });
-  Log.replay();
+  log.replay();
 }