Merge branch 'master' of github-tsch-brown:browngraphicslab/Dash-Web into authentication

1 files changed, 15 insertions, 4 deletions

diff --git a/src/fields/BasicField.ts b/src/fields/BasicField.ts
index 15eb067a0..a92c4a236 100644
--- a/src/fields/BasicField.ts
+++ b/src/fields/BasicField.ts
@@ -1,9 +1,10 @@
-import { Field, FIELD_ID } from "./Field"
+import { Field, FieldId } from "./Field"
 import { observable, computed, action } from "mobx";
 import { Server } from "../client/Server";
+import { UndoManager } from "../client/util/UndoManager";
 
 export abstract class BasicField<T> extends Field {
-    constructor(data: T, save: boolean, id: FIELD_ID = undefined) {
+    constructor(data: T, save: boolean, id?: FieldId) {
         super(id);
 
         this.data = data;
@@ -27,12 +28,22 @@ export abstract class BasicField<T> extends Field {
     }
 
     set Data(value: T) {
-        if (this.data != value) {
-            this.data = value;
+        if (this.data === value) {
+            return;
         }
+        let oldValue = this.data;
+        this.setData(value);
+        UndoManager.AddEvent({
+            undo: () => this.Data = oldValue,
+            redo: () => this.Data = value
+        })
         Server.UpdateField(this);
     }
 
+    protected setData(value: T) {
+        this.data = value;
+    }
+
     @action
     TrySetValue(value: any): boolean {
         if (typeof value == typeof this.data) {