Redo

diff --git a/vopamoi.ts b/vopamoi.ts
index dc61007ec9724a2ec417b1f786670c93a6cc3f6a..284363b047d24fb71bfff0ae2bb4a10c1bc7efe5 100644 (file)
--- a/vopamoi.ts
+++ b/vopamoi.ts
@@ -215,15 +215,16 @@ function Log(prefix: string = "vp-") {
 const log = Log();
 
 function UI() {
 const log = Log();
 
 function UI() {

-  const undoLog: string[] = [];
+  const undoLog: string[][] = [];
+  const redoLog: string[][] = [];

   function perform(forward: string, reverse: string) {
   function perform(forward: string, reverse: string) {

-    undoLog.push(reverse);
+    undoLog.push([reverse, forward]);

     return log.recordAndApply(`${clock.now()} ${forward}`);
   }
   return {
     addTask: function (description: string): Element {
       const now = clock.now();
     return log.recordAndApply(`${clock.now()} ${forward}`);
   }
   return {
     addTask: function (description: string): Element {
       const now = clock.now();

-      undoLog.push(`State ${now} deleted`);
+      undoLog.push([`State ${now} deleted`, `State ${now} todo`]);

       return <Element>log.recordAndApply(`${now} Create ${description}`);
     },
     addTag: function (createTimestamp: string, tag: string) {
       return <Element>log.recordAndApply(`${now} Create ${description}`);
     },
     addTag: function (createTimestamp: string, tag: string) {


@@ -242,8 +243,17 @@ function UI() {
       return perform(`State ${createTimestamp} ${newState}`, `State ${createTimestamp} ${oldState}`);
     },
     undo: function () {
       return perform(`State ${createTimestamp} ${newState}`, `State ${createTimestamp} ${oldState}`);
     },
     undo: function () {

-      if (undoLog.length > 0) {
-        return log.recordAndApply(`${clock.now()} ${undoLog.pop()}`);
+      const entry = undoLog.pop();
+      if (entry) {
+        redoLog.push(entry);
+        return log.recordAndApply(`${clock.now()} ${entry[0]}`);
+      }
+    },
+    redo: function () {
+      const entry = redoLog.pop();
+      if (entry) {
+        undoLog.push(entry);
+        return log.recordAndApply(`${clock.now()} ${entry[1]}`);

       }
     },
   };
       }
     },
   };


@@ -464,6 +474,10 @@ function BrowserUI() {
       const ret = ui.undo();
       if (ret && ret instanceof HTMLElement) ret.focus();
     },
       const ret = ui.undo();
       if (ret && ret instanceof HTMLElement) ret.focus();
     },

+    redo: function () {
+      const ret = ui.redo();
+      if (ret && ret instanceof HTMLElement) ret.focus();
+    },

   };
 }
 const browserUI = BrowserUI();
   };
 }
 const browserUI = BrowserUI();


@@ -504,6 +518,7 @@ function handleKey(event: any) {
       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 == "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.key == "e") return browserUI.beginEdit(event);
       if (event.key == "t") return browserUI.beginTagEdit(event);
       if (event.key == "v") return (inputState = InputState.V);