diff options
| author | Jude <julie_wang1@brown.edu> | 2019-03-10 21:46:32 -0400 |
|---|---|---|
| committer | Jude <julie_wang1@brown.edu> | 2019-03-10 21:46:32 -0400 |
| commit | 03ce1e07841ecc67c5f63507590989fb606f0af7 (patch) | |
| tree | ba183557755be9ced24151c10aacb1676c0e0e43 /src/client/views/Main.tsx | |
| parent | 772182d40f180121ed14384bc9c6f623dd77c415 (diff) | |
| parent | d10a091db9b2dd2656fde172628d62c4dbf67970 (diff) | |
Merge branch 'ui_improvements' of https://github.com/browngraphicslab/Dash-Web into ui_improvements
Diffstat (limited to 'src/client/views/Main.tsx')
| -rw-r--r-- | src/client/views/Main.tsx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/client/views/Main.tsx b/src/client/views/Main.tsx index e4ef90d97..d0bfa1f21 100644 --- a/src/client/views/Main.tsx +++ b/src/client/views/Main.tsx @@ -124,8 +124,7 @@ Documents.initProtos(mainDocId, (res?: Document) => { < div id="toolbar" > <button className="toolbar-button round-button" title="Undo" onClick={() => UndoManager.Undo()}><FontAwesomeIcon icon="undo-alt" size="sm" /></button> <button className="toolbar-button round-button" title="Redo" onClick={() => UndoManager.Redo()}><FontAwesomeIcon icon="redo-alt" size="sm" /></button> - {/* @TODO do the ink thing */} - < button className="toolbar-button round-button" title="Ink" > <FontAwesomeIcon icon="pen-nib" size="sm" /></button > + <button className="toolbar-button round-button" title="Ink" onClick={() => InkingControl.Instance.toggleDisplay()}><FontAwesomeIcon icon="pen-nib" size="sm" /></button> </div > {/* for the expandable add nodes menu. Not included with the above because once it expands it expands the whole div with it, making canvas interactions limited. */} @@ -164,7 +163,7 @@ Documents.initProtos(mainDocId, (res?: Document) => { </div > - {/* <InkingControl /> */} + <InkingControl /> </div >), document.getElementById('root')); }) |