From 35ac75738a707f7001f6b881e8ad8d6f058c6892 Mon Sep 17 00:00:00 2001
From: bob <bcz@cs.brown.edu>
Date: Fri, 15 Feb 2019 16:25:12 -0500
Subject: working version.... kind of

---
 src/fields/BasicField.ts  | 5 ++---
 src/fields/Document.ts    | 3 +++
 src/fields/ListField.ts   | 3 ---
 src/fields/NumberField.ts | 2 +-
 4 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'src/fields')

diff --git a/src/fields/BasicField.ts b/src/fields/BasicField.ts
index 95f737dea..6326a90ad 100644
--- a/src/fields/BasicField.ts
+++ b/src/fields/BasicField.ts
@@ -27,10 +27,9 @@ export abstract class BasicField<T> extends Field {
     }
 
     set Data(value: T) {
-        if (this.data === value) {
-            return;
+        if (this.data != value) {
+            this.data = value;
         }
-        this.data = value;
         Server.UpdateField(this);
     }
 
diff --git a/src/fields/Document.ts b/src/fields/Document.ts
index 4b159b4eb..0d233c295 100644
--- a/src/fields/Document.ts
+++ b/src/fields/Document.ts
@@ -58,6 +58,8 @@ export class Document extends Field {
                     break;
                 }
             }
+            if (doc == FieldWaiting)
+                field = FieldWaiting;
         }
 
         return field;
@@ -101,6 +103,7 @@ export class Document extends Field {
 
     @action
     Set(key: Key, field: Field | undefined): void {
+        console.log("Assign: " + key.Name + " = " + (field ? field.GetValue() : "<undefined>") + " (" + (field ? field.Id : "<undefined>") + ")");
         if (field) {
             this.fields.set(key.Id, { key, field });
             this._proxies.set(key.Id, field.Id)
diff --git a/src/fields/ListField.ts b/src/fields/ListField.ts
index d3d8fc71b..a46ce813d 100644
--- a/src/fields/ListField.ts
+++ b/src/fields/ListField.ts
@@ -43,17 +43,14 @@ export class ListField<T extends Field> extends BasicField<T[]> {
     }
 
     init(callback: (field: Field) => any) {
-        console.log("requesting list fields " + this._proxies.length)
         Server.GetFields(this._proxies, action((fields: { [index: string]: Field }) => {
             if (!this.arraysEqual(this._proxies, this.Data.map(field => field.Id))) {
-                console.log("Got new fields " + this.Data.length)
                 this.Data = this._proxies.map(id => fields[id] as T)
                 observe(this.Data, () => {
                     this.updateProxies()
                     Server.UpdateField(this);
                 })
             }
-            console.log("received fields " + this.Data)
             callback(this);
         }))
     }
diff --git a/src/fields/NumberField.ts b/src/fields/NumberField.ts
index 29e285201..6571695de 100644
--- a/src/fields/NumberField.ts
+++ b/src/fields/NumberField.ts
@@ -4,7 +4,7 @@ import { FIELD_ID } from "./Field";
 
 export class NumberField extends BasicField<number> {
     constructor(data: number = 0, id: FIELD_ID = undefined, save: boolean = true) {
-        super(data, save, id);
+        super(data, false, id);
     }
 
     ToScriptString(): string {
-- 
cgit v1.2.3-70-g09d2