aboutsummaryrefslogtreecommitdiff
path: root/src/client/views/Main.tsx
diff options
context:
space:
mode:
authortschicke-brown <tyler_schicke@brown.edu>2019-03-08 04:58:58 +0000
committerGitHub <noreply@github.com>2019-03-08 04:58:58 +0000
commit5a1da11a5767899aac2f1bfac6d33e0ee5d47c9e (patch)
tree303cc06880b6c5e0cc644f559c9548f95790423e /src/client/views/Main.tsx
parent9940924f361f1b9d65d7cc0ad1e4f6f1f4d5d318 (diff)
parent889407852167dece0160127817e390336697e3a6 (diff)
Merge pull request #45 from browngraphicslab/inking
Inking
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'));
})