diff options
| author | Tyler Schicke <tyler_schicke@brown.edu> | 2019-06-05 22:42:43 -0400 |
|---|---|---|
| committer | Tyler Schicke <tyler_schicke@brown.edu> | 2019-06-05 22:42:43 -0400 |
| commit | 404dcc71558d8de69369aa499227e5168091351d (patch) | |
| tree | 05509329005fb08cecfb072ba063391bc6ab8a44 /src/client | |
| parent | 2ce189fdf66a0f01b38d28c73c8f6f1247933b3d (diff) | |
Can now pass list to schema function to get list of that type
Mapped type of a schema can be another schema
Added tests for schemas
Other minor fixes
Diffstat (limited to 'src/client')
| -rw-r--r-- | src/client/views/MainOverlayTextBox.tsx | 2 | ||||
| -rw-r--r-- | src/client/views/collections/collectionFreeForm/MarqueeView.tsx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/client/views/MainOverlayTextBox.tsx b/src/client/views/MainOverlayTextBox.tsx index 24327b995..d1224febe 100644 --- a/src/client/views/MainOverlayTextBox.tsx +++ b/src/client/views/MainOverlayTextBox.tsx @@ -102,6 +102,6 @@ export class MainOverlayTextBox extends React.Component<MainOverlayTextBoxProps> </div> </ div>; } - else return (null); Z + else return (null); } }
\ No newline at end of file diff --git a/src/client/views/collections/collectionFreeForm/MarqueeView.tsx b/src/client/views/collections/collectionFreeForm/MarqueeView.tsx index 81ca4c29a..c699b3437 100644 --- a/src/client/views/collections/collectionFreeForm/MarqueeView.tsx +++ b/src/client/views/collections/collectionFreeForm/MarqueeView.tsx @@ -92,7 +92,7 @@ export class MarqueeView extends React.Component<MarqueeViewProps> this.pasteTable(ns, x, y); } }); - } else { + } else if (!e.ctrlKey) { let newBox = Docs.TextDocument({ width: 200, height: 100, x: x, y: y, title: "-typed text-" }); this.props.addLiveTextDocument(newBox); } |
