diff options
| author | yipstanley <stanley_yip@brown.edu> | 2019-07-15 11:57:43 -0400 |
|---|---|---|
| committer | yipstanley <stanley_yip@brown.edu> | 2019-07-15 11:57:43 -0400 |
| commit | a25dba059a49428394d897aaf0562b8c3d2348ba (patch) | |
| tree | 5dcfe6be7ec7296f76d2ff2f0bddc3cc639bab8b /src | |
| parent | 4e17f0575b73466d745b7445d9bab85f038a5622 (diff) | |
| parent | c9bf8852a77298e1e958cfc72559418b6cb5981a (diff) | |
Merge branch 'master' of https://github.com/browngraphicslab/Dash-Web
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/util/TooltipTextMenu.tsx | 2 | ||||
| -rw-r--r-- | src/client/views/collections/CollectionDockingView.tsx | 1 | ||||
| -rw-r--r-- | src/server/Search.ts | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/src/client/util/TooltipTextMenu.tsx b/src/client/util/TooltipTextMenu.tsx index 0d3adef2e..9ba339285 100644 --- a/src/client/util/TooltipTextMenu.tsx +++ b/src/client/util/TooltipTextMenu.tsx @@ -243,7 +243,7 @@ export class TooltipTextMenu { handlers: { dragComplete: action(() => { let m = dragData.droppedDocuments; - this.makeLink(DocServer.prepend("/doc/" + m[0][Id])); + m.length && this.makeLink(DocServer.prepend("/doc/" + m[0][Id])); }), }, hideSource: false diff --git a/src/client/views/collections/CollectionDockingView.tsx b/src/client/views/collections/CollectionDockingView.tsx index 781bafec0..1069ebbdb 100644 --- a/src/client/views/collections/CollectionDockingView.tsx +++ b/src/client/views/collections/CollectionDockingView.tsx @@ -260,6 +260,7 @@ export class CollectionDockingView extends React.Component<SubCollectionViewProp // Because this is in a set timeout, if this component unmounts right after mounting, // we will leak a GoldenLayout, because we try to destroy it before we ever create it setTimeout(() => this.setupGoldenLayout(), 1); + DocListCast((CurrentUserUtils.UserDocument.workspaces as Doc).data).map(d => d.workspaceBrush = false); this.props.Document.workspaceBrush = true; } this._ignoreStateChange = ""; diff --git a/src/server/Search.ts b/src/server/Search.ts index 98f421937..11092c5be 100644 --- a/src/server/Search.ts +++ b/src/server/Search.ts @@ -26,7 +26,7 @@ export class Search { }); return res; } catch (e) { - // console.warn("Search error: " + e + document); + // console.warn("Search error: ", e, documents); } } |