diff options
| author | usodhi <61431818+usodhi@users.noreply.github.com> | 2020-09-25 15:34:33 +0530 |
|---|---|---|
| committer | usodhi <61431818+usodhi@users.noreply.github.com> | 2020-09-25 15:34:33 +0530 |
| commit | 56d59f8020a01c44a7027d03bd1d8bf2d87b4cb1 (patch) | |
| tree | 953c6708685c0b03e9f74a42a6f19093aebdaf70 /src | |
| parent | bc45c96768a24a5c9b9735d610d407e856b05744 (diff) | |
| parent | ee511f1e0b5ce7de221d3c6ed6251c1636db54fc (diff) | |
Merge branch 'master' of https://github.com/browngraphicslab/Dash-Web into acls_uv
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/util/LinkManager.ts | 2 | ||||
| -rw-r--r-- | src/client/views/collections/CollectionSubView.tsx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/client/util/LinkManager.ts b/src/client/util/LinkManager.ts index 4f3cfcd03..694a7f3a7 100644 --- a/src/client/util/LinkManager.ts +++ b/src/client/util/LinkManager.ts @@ -63,7 +63,7 @@ export class LinkManager { // finds all links that contain the given anchor public getAllDirectLinks(anchor: Doc): Doc[] { const related = LinkManager.Instance.getAllLinks().filter(link => link).filter(link => { - const a1 = Cast(link.anchor1, Doc, null) + const a1 = Cast(link.anchor1, Doc, null); const a2 = Cast(link.anchor2, Doc, null); const protomatch1 = Doc.AreProtosEqual(anchor, a1); const protomatch2 = Doc.AreProtosEqual(anchor, a2); diff --git a/src/client/views/collections/CollectionSubView.tsx b/src/client/views/collections/CollectionSubView.tsx index d9c4d274a..a78923312 100644 --- a/src/client/views/collections/CollectionSubView.tsx +++ b/src/client/views/collections/CollectionSubView.tsx @@ -243,7 +243,7 @@ export function CollectionSubView<T, X>(schemaCtor: (doc: Doc) => T, moreProps?: e.stopPropagation(); return added; } - else if (de.complete.annoDragData) { + else if (de.complete.annoDragData && (!this.props.isAnnotationOverlay || de.complete.annoDragData.dragDocument === this.props.Document)) { e.stopPropagation(); return this.addDocument(de.complete.annoDragData.dropDocument); } |