1 files changed, 27 insertions, 3 deletions
diff --git a/src/client/views/nodes/Timeline.tsx b/src/client/views/nodes/Timeline.tsx
index 711b6c3bc..1b6629a55 100644
--- a/src/client/views/nodes/Timeline.tsx
+++ b/src/client/views/nodes/Timeline.tsx
@@ -6,10 +6,17 @@ 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 { DocumentViewProps } from "./DocumentView";
+
+=======
 import { Opt } from '../../../fields/Field';
+>>>>>>> 6304e03f953b2cc66dcc1a0900855376ff739015
 
 @observer
-export class Timeline extends React.Component {
+export class Timeline extends React.Component<DocumentViewProps> {
     @observable private _inner = React.createRef<HTMLDivElement>();
     @observable private _isRecording: Boolean = false;
     @observable private _currentBar: any = null;
@@ -24,6 +31,10 @@ export class Timeline extends React.Component {
     @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%";
@@ -31,9 +42,8 @@ export class Timeline extends React.Component {
             this._newBar.style.backgroundColor = "yellow";
             this._newBar.style.transform = this._currentBar.style.transform;
             this._inner.current.appendChild(this._newBar);
+>>>>>>> 6304e03f953b2cc66dcc1a0900855376ff739015
         }
-        this._currentBar.remove();
-        this._currentBar = null;
     }
 
     @action
@@ -67,17 +77,30 @@ export class Timeline extends React.Component {
 
     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() {
@@ -85,6 +108,7 @@ export class Timeline extends React.Component {
             this._reactionDisposer();
             this._reactionDisposer = undefined;
         }
+>>>>>>> 6304e03f953b2cc66dcc1a0900855376ff739015
     }
 
     render() {