From 6e66f8b227c730e07863a93a8bce5ee0d51d2ddc Mon Sep 17 00:00:00 2001
From: bob <bcz@cs.brown.edu>
Date: Tue, 5 Feb 2019 12:29:57 -0500
Subject: working refactored version.

---
 src/Main.tsx                     | 4 ++--
 src/views/nodes/DocumentView.tsx | 8 +++-----
 2 files changed, 5 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/Main.tsx b/src/Main.tsx
index b72083ee6..247733d3a 100644
--- a/src/Main.tsx
+++ b/src/Main.tsx
@@ -66,14 +66,14 @@ document.addEventListener("pointerdown", action(function (e: PointerEvent) {
     if (!mainNodes) {
         mainNodes = new ListField<Document>();
     }
-    mainNodes.Data.push(doc1);
+    // mainNodes.Data.push(doc6);
     // mainNodes.Data.push(doc2);
     mainNodes.Data.push(doc4);
     // mainNodes.Data.push(doc3);
     // mainNodes.Data.push(doc5);
     // mainNodes.Data.push(doc1);
     //mainNodes.Data.push(doc2);
-    mainNodes.Data.push(doc7);
+    mainNodes.Data.push(doc6);
     mainContainer.SetField(KeyStore.Data, mainNodes);
 }
 //);
diff --git a/src/views/nodes/DocumentView.tsx b/src/views/nodes/DocumentView.tsx
index 7b81752ad..a1262e2ba 100644
--- a/src/views/nodes/DocumentView.tsx
+++ b/src/views/nodes/DocumentView.tsx
@@ -130,7 +130,8 @@ export class DocumentView extends React.Component<DocumentViewProps> {
         for (const key of this.layoutKeys) {
             bindings[key.Name + "Key"] = key;
         }
-        bindings.DocumentView = this;
+        if (bindings.DocumentView === undefined)
+            bindings.DocumentView = this;
         for (const key of this.layoutFields) {
             let field = doc.GetField(key);
             if (field) {
@@ -138,10 +139,7 @@ export class DocumentView extends React.Component<DocumentViewProps> {
             }
         }
         return (
-            <div className="node" ref={this._mainCont} style={{
-                width: "100%",
-                height: "100%",
-            }}>
+            <div className="node" ref={this._mainCont} style={{ width: "100%", height: "100%", }}>
                 <JsxParser
                     components={{ FormattedTextBox: FormattedTextBox, ImageBox, CollectionFreeFormView, CollectionDockingView, CollectionSchemaView }}
                     bindings={bindings}
-- 
cgit v1.2.3-70-g09d2