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/client/views/Main.tsx                                 |  2 ++
 src/client/views/nodes/CollectionFreeFormDocumentView.tsx | 11 +++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'src/client/views')

diff --git a/src/client/views/Main.tsx b/src/client/views/Main.tsx
index 14e60409e..1ae691bf5 100644
--- a/src/client/views/Main.tsx
+++ b/src/client/views/Main.tsx
@@ -67,6 +67,7 @@ Documents.initProtos(() => {
         console.log("RESPONSE: " + res)
         let mainContainer: Document;
         if (res) {
+            var lid = KeyStore.Layout.Id;
             let obj = ServerUtils.FromJson(res) as Document
             mainContainer = obj
         }
@@ -75,6 +76,7 @@ Documents.initProtos(() => {
             let doc4 = Documents.CollectionDocument(docset, {
                 x: 0, y: 400, title: "mini collection"
             }, mainDocId);
+            var lid = KeyStore.Layout.Id;
             mainContainer = doc4;
             let args = new DocumentTransfer(mainContainer.ToJson())
             Utils.Emit(Server.Socket, MessageStore.AddDocument, args)
diff --git a/src/client/views/nodes/CollectionFreeFormDocumentView.tsx b/src/client/views/nodes/CollectionFreeFormDocumentView.tsx
index 1d53cedc4..616ccea65 100644
--- a/src/client/views/nodes/CollectionFreeFormDocumentView.tsx
+++ b/src/client/views/nodes/CollectionFreeFormDocumentView.tsx
@@ -204,14 +204,13 @@ export class CollectionFreeFormDocumentView extends DocumentView {
     }
 
     render() {
-        var freestyling = this.props.ContainingCollectionView instanceof CollectionFreeFormView;
         return (
             <div className="node" ref={this._mainCont} style={{
-                transform: freestyling ? this.transform : "",
-                width: freestyling ? this.width : "100%",
-                height: freestyling ? this.height : "100%",
-                position: freestyling ? "absolute" : "relative",
-                zIndex: freestyling ? this.zIndex : 0,
+                transform: this.transform,
+                width: this.width,
+                height: this.height,
+                position: "absolute",
+                zIndex: this.zIndex,
             }}
                 onContextMenu={this.onContextMenu}
                 onPointerDown={this.onPointerDown}>
-- 
cgit v1.2.3-70-g09d2