diff options
| author | bob <bcz@cs.brown.edu> | 2019-06-14 11:56:40 -0400 |
|---|---|---|
| committer | bob <bcz@cs.brown.edu> | 2019-06-14 11:56:40 -0400 |
| commit | 0c9dc7be8c6b885b14ed4aacd7e9c8cd5c8bf208 (patch) | |
| tree | 66325669dce7efe966b42f268a04faaa4c899532 /src/client/views/nodes/DocumentView.tsx | |
| parent | 6a2cb71af332d4c782c1678750ba955757eaab45 (diff) | |
| parent | 618d3717e118f978de976cb34e8bc2051c726ffc (diff) | |
Merge branch 'master' into pdf_impl
Diffstat (limited to 'src/client/views/nodes/DocumentView.tsx')
| -rw-r--r-- | src/client/views/nodes/DocumentView.tsx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/client/views/nodes/DocumentView.tsx b/src/client/views/nodes/DocumentView.tsx index 051940cc4..6fe01963a 100644 --- a/src/client/views/nodes/DocumentView.tsx +++ b/src/client/views/nodes/DocumentView.tsx @@ -269,7 +269,8 @@ export class DocumentView extends DocComponent<DocumentViewProps, Document>(Docu if (!linkedFwdDocs.some(l => l instanceof Promise)) { let maxLocation = StrCast(linkedFwdDocs[altKey ? 1 : 0].maximizeLocation, "inTab"); - DocumentManager.Instance.jumpToDocument(linkedFwdDocs[altKey ? 1 : 0], ctrlKey, document => this.props.addDocTab(document, maxLocation), linkedFwdPage[altKey ? 1 : 0], linkedFwdContextDocs[altKey ? 1 : 0]); + let targetContext = !Doc.AreProtosEqual(linkedFwdContextDocs[altKey ? 1 : 0], this.props.ContainingCollectionView && this.props.ContainingCollectionView.props.Document) ? linkedFwdContextDocs[altKey ? 1 : 0] : undefined; + DocumentManager.Instance.jumpToDocument(linkedFwdDocs[altKey ? 1 : 0], ctrlKey, document => this.props.addDocTab(document, maxLocation), linkedFwdPage[altKey ? 1 : 0], targetContext); } } } |
