From ffd6c9eadd0097b3a27fac183d0b7c223301a7c4 Mon Sep 17 00:00:00 2001 From: bobzel Date: Thu, 22 Oct 2020 18:18:28 -0400 Subject: added pinwithView for videos --- src/client/views/nodes/PresBox.tsx | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/client/views/nodes') diff --git a/src/client/views/nodes/PresBox.tsx b/src/client/views/nodes/PresBox.tsx index d05674d69..4d0749635 100644 --- a/src/client/views/nodes/PresBox.tsx +++ b/src/client/views/nodes/PresBox.tsx @@ -337,6 +337,8 @@ export class PresBox extends ViewBoxBaseComponent bestTarget._scrollY = activeItem.presPinViewScroll; } else if (bestTarget.type === DocumentType.COMPARISON) { bestTarget._clipWidth = activeItem.presPinClipWidth; + } else if (bestTarget.type === DocumentType.VID) { + bestTarget._currentTimecode = activeItem.presPinTimecode; } else { bestTarget._viewTransition = activeItem.presTransition ? `transform ${activeItem.presTransition}ms` : 'all 0.5s'; bestTarget._panX = activeItem.presPinViewX; -- cgit v1.2.3-70-g09d2 From 9227d660cff098e8db0ed20c9b5283f79f833bdf Mon Sep 17 00:00:00 2001 From: bobzel Date: Thu, 22 Oct 2020 22:51:56 -0400 Subject: fixed presBox errors related to opening context menu --- src/client/views/nodes/PresBox.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/client/views/nodes') diff --git a/src/client/views/nodes/PresBox.tsx b/src/client/views/nodes/PresBox.tsx index 4d0749635..01ca8240b 100644 --- a/src/client/views/nodes/PresBox.tsx +++ b/src/client/views/nodes/PresBox.tsx @@ -136,7 +136,7 @@ export class PresBox extends ViewBoxBaseComponent } @action - componentDidMount = () => { + componentDidMount() { this.rootDoc.presBox = this.rootDoc; this.rootDoc._forceRenderEngine = "timeline"; this.rootDoc._replacedChrome = "replaced"; -- cgit v1.2.3-70-g09d2 From 5fdc26ef1dcf7ea1260ee6ea05a38b7f3746eb25 Mon Sep 17 00:00:00 2001 From: bobzel Date: Fri, 23 Oct 2020 00:46:48 -0400 Subject: fixed presBox to re-use a tab instead of creating one when Open is set. --- src/client/views/nodes/PresBox.tsx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/client/views/nodes') diff --git a/src/client/views/nodes/PresBox.tsx b/src/client/views/nodes/PresBox.tsx index 01ca8240b..4149636b8 100644 --- a/src/client/views/nodes/PresBox.tsx +++ b/src/client/views/nodes/PresBox.tsx @@ -298,7 +298,12 @@ export class PresBox extends ViewBoxBaseComponent const docToJump = curDoc; const willZoom = false; const openInTab = () => { - collectionDocView ? collectionDocView.props.addDocTab(activeItem, "replace") : this.props.addDocTab(activeItem, "replace:left"); + const tab = Array.from(CollectionDockingView.Instance.tabMap).find(tab => tab.DashDoc === activeItem); + if (tab) { + tab.header.parent.setActiveContentItem(tab.contentItem); + } else { + collectionDocView ? collectionDocView.props.addDocTab(activeItem, "replace") : this.props.addDocTab(activeItem, "replace:left"); + } }; // If openDocument is selected then it should open the document for the user if (activeItem.openDocument) { -- cgit v1.2.3-70-g09d2