fixed

2 files changed, 3 insertions, 47 deletions

diff --git a/src/client/views/Main.tsx b/src/client/views/Main.tsx
index ca77ff245..5478315e9 100644
--- a/src/client/views/Main.tsx
+++ b/src/client/views/Main.tsx
@@ -113,9 +113,9 @@ export class Main extends React.Component {
         window.addEventListener("drop", (e) => e.preventDefault(), false); // drop event handler
         window.addEventListener("dragover", (e) => e.preventDefault(), false); // drag event handler
         window.addEventListener("keydown", (e) => {
-            if (e.key == "Escape") {
+            if (e.key === "Escape") {
                 DragManager.AbortDrag();
-                SelectionManager.DeselectAll()
+                SelectionManager.DeselectAll();
             }
         }, false); // drag event handler
         // click interactions for the context menu
@@ -274,8 +274,6 @@ export class Main extends React.Component {
         ];
     }
 
-<<<<<<< HEAD
-=======
     @computed
     get workspaceMenu() {
         let areWorkspacesShown = () => this._workspacesShown;
@@ -286,7 +284,6 @@ export class Main extends React.Component {
                 new={this.createNewWorkspace} allWorkspaces={workspaces.Data}
                 isShown={areWorkspacesShown} toggle={toggleWorkspaces} />;
     }
->>>>>>> e47656cdc18aa1fd801a3853fa0f819140a68646
 
     render() {
         return (
@@ -333,28 +330,9 @@ export class Main extends React.Component {
         }
     }
     async initializeNorthstar(): Promise<void> {
-<<<<<<< HEAD
-        let envPath = "/assets/env.json";
-        const response = await fetch(envPath, {
-            redirect: "follow",
-            method: "GET",
-            credentials: "include"
-        });
-        const env = await response.json();
-        Settings.Instance.Update(env);
-        let cat = Gateway.Instance.ClearCatalog();
-        cat.then(async () => {
-            this.AddToNorthstarCatalog(await Gateway.Instance.GetCatalog());
-            if (!CurrentUserUtils.GetNorthstarSchema("Book1")) {
-                this.AddToNorthstarCatalog(await Gateway.Instance.GetSchema("http://www.cs.brown.edu/~bcz/Book1.csv"));
-            }
-        });
-
-=======
         const getEnvironment = await fetch("/assets/env.json", { redirect: "follow", method: "GET", credentials: "include" });
         NorthstarSettings.Instance.UpdateEnvironment(await getEnvironment.json());
         Gateway.Instance.ClearCatalog().then(async () => this.SetNorthstarCatalog(await Gateway.Instance.GetCatalog()));
->>>>>>> e47656cdc18aa1fd801a3853fa0f819140a68646
     }
 }
 
diff --git a/src/client/views/nodes/Timeline.tsx b/src/client/views/nodes/Timeline.tsx
index 1b6629a55..d1036bab8 100644
--- a/src/client/views/nodes/Timeline.tsx
+++ b/src/client/views/nodes/Timeline.tsx
@@ -6,14 +6,11 @@ import "./Timeline.scss";
 import { KeyStore } from "../../../fields/KeyStore";
 import { Document } from "../../../fields/Document";
 import { KeyFrame } from "./KeyFrame";
-<<<<<<< HEAD
 import { CollectionViewProps } from "../collections/CollectionBaseView";
-import { CollectionSubView } from "../collections/CollectionSubView"; 
+import { CollectionSubView } from "../collections/CollectionSubView";
 import { DocumentViewProps } from "./DocumentView";
 
-=======
 import { Opt } from '../../../fields/Field';
->>>>>>> 6304e03f953b2cc66dcc1a0900855376ff739015
 
 @observer
 export class Timeline extends React.Component<DocumentViewProps> {
@@ -31,10 +28,6 @@ export class Timeline extends React.Component<DocumentViewProps> {
     @action
     onStop = (e: React.MouseEvent) => {
         this._isRecording = false;
-<<<<<<< HEAD
-        if (this._inner.current) {
-            
-=======
         if (this._inner.current) { //if you comment this section out it works as before...
             this._newBar = document.createElement("div");
             this._newBar.style.height = "100%";
@@ -42,7 +35,6 @@ export class Timeline extends React.Component<DocumentViewProps> {
             this._newBar.style.backgroundColor = "yellow";
             this._newBar.style.transform = this._currentBar.style.transform;
             this._inner.current.appendChild(this._newBar);
->>>>>>> 6304e03f953b2cc66dcc1a0900855376ff739015
         }
     }
 
@@ -77,30 +69,17 @@ export class Timeline extends React.Component<DocumentViewProps> {
 
     componentDidMount() {
         this.createBar(5);
-<<<<<<< HEAD
-        let doc: Document = this.props.Document;
-        console.log(doc.Get(KeyStore.BackgroundColor)); 
-        let keyFrame = new KeyFrame(); 
-        this._keyFrames.push(keyFrame); 
-        let keys = [KeyStore.X, KeyStore.Y];
-        reaction(() => {       
-=======
         let doc: Document;
         let keyFrame = new KeyFrame();
         this._keyFrames.push(keyFrame);
         let keys = [KeyStore.X, KeyStore.Y];
         this._reactionDisposer = reaction(() => {
->>>>>>> 6304e03f953b2cc66dcc1a0900855376ff739015
             return keys.map(key => doc.GetNumber(key, 0));
         }, data => {
             keys.forEach((key, index) => {
                 keyFrame.document().SetNumber(key, data[index]);
             });
         });
-<<<<<<< HEAD
-
-        console.log(keyFrame.document +  "Document"); 
-=======
     }
 
     componentWillUnmount() {
@@ -108,7 +87,6 @@ export class Timeline extends React.Component<DocumentViewProps> {
             this._reactionDisposer();
             this._reactionDisposer = undefined;
         }
->>>>>>> 6304e03f953b2cc66dcc1a0900855376ff739015
     }
 
     render() {