diff options
author | Tyler Schicke <tyler_schicke@brown.edu> | 2019-05-03 20:47:40 -0400 |
---|---|---|
committer | Tyler Schicke <tyler_schicke@brown.edu> | 2019-05-03 20:47:40 -0400 |
commit | 070787b6be93dca4a43ec7e893ae4ac4b4d80e59 (patch) | |
tree | 4b93ac202fe813033b6d07f7202ab217c0da79f8 /src/client/views/nodes/DocumentView.tsx | |
parent | 9b33ac1cb790e88558edb3e4626f5a7b759ea3db (diff) | |
parent | 95d89a193b25d19faf6da0af1412480a36fc9ebe (diff) |
Merge branch 'master' of github-tsch-brown:browngraphicslab/Dash-Web into newDocs
Diffstat (limited to 'src/client/views/nodes/DocumentView.tsx')
-rw-r--r-- | src/client/views/nodes/DocumentView.tsx | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/client/views/nodes/DocumentView.tsx b/src/client/views/nodes/DocumentView.tsx index c08e322c0..fd012e7ea 100644 --- a/src/client/views/nodes/DocumentView.tsx +++ b/src/client/views/nodes/DocumentView.tsx @@ -25,6 +25,7 @@ import { CollectionFreeFormView } from "../collections/collectionFreeForm/Collec import { CurrentUserUtils } from "../../../server/authentication/models/current_user_utils"; import { DocServer } from "../../DocServer"; import { Id } from "../../../new_fields/RefField"; +import { PresentationView } from "../PresentationView"; const linkSchema = createSchema({ title: "string", @@ -277,7 +278,12 @@ export class DocumentView extends DocComponent<DocumentViewProps, Document>(Docu ContextMenu.Instance.addItem({ description: "Copy URL", event: () => Utils.CopyText(DocServer.prepend("/doc/" + this.props.Document[Id])) }); ContextMenu.Instance.addItem({ description: "Copy ID", event: () => Utils.CopyText(this.props.Document[Id]) }); //ContextMenu.Instance.addItem({ description: "Docking", event: () => this.props.Document.SetNumber(KeyStore.ViewType, CollectionViewType.Docking) }) + ContextMenu.Instance.addItem({ description: "Pin to Presentation", event: () => PresentationView.Instance.PinDoc(this.props.Document) }); ContextMenu.Instance.addItem({ description: "Delete", event: this.deleteClicked }); + if (!this.topMost) { + // DocumentViews should stop propagation of this event + e.stopPropagation(); + } ContextMenu.Instance.displayMenu(e.pageX - 15, e.pageY - 15); if (!SelectionManager.IsSelected(this)) { SelectionManager.SelectDoc(this, false); @@ -313,4 +319,4 @@ export class DocumentView extends DocComponent<DocumentViewProps, Document>(Docu </div> ); } -} +}
\ No newline at end of file |