diff options
| author | yipstanley <stanley_yip@brown.edu> | 2019-11-09 14:13:20 -0500 |
|---|---|---|
| committer | yipstanley <stanley_yip@brown.edu> | 2019-11-09 14:13:20 -0500 |
| commit | 517bccdf0921169fd83312f3cedd044522a2398e (patch) | |
| tree | d171ec7672230dded66606f8f7e25618b2e70338 /src/client/views/DocumentDecorations.tsx | |
| parent | ca406ddce0a9b35ca9063f74979c952e080339f1 (diff) | |
| parent | 5c6dc8fb25c2ac65a9efa534ee86211ac6d68301 (diff) | |
Merge branch 'master' of https://github.com/browngraphicslab/Dash-Web into inking_to_doc
Diffstat (limited to 'src/client/views/DocumentDecorations.tsx')
| -rw-r--r-- | src/client/views/DocumentDecorations.tsx | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/client/views/DocumentDecorations.tsx b/src/client/views/DocumentDecorations.tsx index c3020eacb..495e1d2b2 100644 --- a/src/client/views/DocumentDecorations.tsx +++ b/src/client/views/DocumentDecorations.tsx @@ -583,8 +583,13 @@ export class DocumentDecorations extends React.Component<{}, { value: string }> } render() { var bounds = this.Bounds; +<<<<<<< HEAD let seldoc = SelectionManager.AllSelected().length ? SelectionManager.AllSelected()[0] : undefined; if (bounds.x === Number.MAX_VALUE || !seldoc || this._hidden || isNaN(bounds.r) || isNaN(bounds.b) || isNaN(bounds.x) || isNaN(bounds.y)) { +======= + let seldoc = SelectionManager.SelectedDocuments().length ? SelectionManager.SelectedDocuments()[0] : undefined; + if (SelectionManager.GetIsDragging() || bounds.x === Number.MAX_VALUE || !seldoc || this._hidden || isNaN(bounds.r) || isNaN(bounds.b) || isNaN(bounds.x) || isNaN(bounds.y)) { +>>>>>>> 5c6dc8fb25c2ac65a9efa534ee86211ac6d68301 return (null); } let minimizeIcon = ( |