aboutsummaryrefslogtreecommitdiff
path: root/src/client/views/Main.tsx
diff options
context:
space:
mode:
authorFawn <fangrui_tong@brown.edu>2019-03-06 18:58:00 -0500
committerFawn <fangrui_tong@brown.edu>2019-03-06 18:58:00 -0500
commitc6781458648c4265f2f995be526529be54312f54 (patch)
tree7cbdb01df793a6709a614c89268b887181c6b677 /src/client/views/Main.tsx
parent3e7e715a235db4da57ba22b5cce1ee3c873f5a40 (diff)
all inking code
Diffstat (limited to 'src/client/views/Main.tsx')
-rw-r--r--src/client/views/Main.tsx2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/client/views/Main.tsx b/src/client/views/Main.tsx
index d845fa7a3..7aca6d88f 100644
--- a/src/client/views/Main.tsx
+++ b/src/client/views/Main.tsx
@@ -17,6 +17,7 @@ import { ContextMenu } from './ContextMenu';
import { DocumentDecorations } from './DocumentDecorations';
import { DocumentView } from './nodes/DocumentView';
import "./Main.scss";
+import { InkingControl } from './InkingControl';
configure({ enforceActions: "observed" }); // causes errors to be generated when modifying an observable outside of an action
@@ -96,6 +97,7 @@ Documents.initProtos(mainDocId, (res?: Document) => {
<button onClick={clearDatabase}>Clear Database</button></div>
<button className="main-undoButtons" style={{ bottom: '25px' }} onClick={() => UndoManager.Undo()}>Undo</button>
<button className="main-undoButtons" style={{ bottom: '0px' }} onClick={() => UndoManager.Redo()}>Redo</button>
+ <InkingControl />
</div>),
document.getElementById('root'));
})