aboutsummaryrefslogtreecommitdiff
path: root/src/client/views
diff options
context:
space:
mode:
authorbob <bcz@cs.brown.edu>2019-02-15 16:25:12 -0500
committerbob <bcz@cs.brown.edu>2019-02-15 16:25:12 -0500
commit35ac75738a707f7001f6b881e8ad8d6f058c6892 (patch)
tree34b33b734b0fbcd7317228354cbca3332b283342 /src/client/views
parent1e5c20010544b12936fbc8dd0bddfb11b947fbd3 (diff)
working version.... kind of
Diffstat (limited to 'src/client/views')
-rw-r--r--src/client/views/Main.tsx2
-rw-r--r--src/client/views/nodes/CollectionFreeFormDocumentView.tsx11
2 files changed, 7 insertions, 6 deletions
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}>