aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorbobzel <zzzman@gmail.com>2022-03-08 22:11:24 -0500
committerbobzel <zzzman@gmail.com>2022-03-08 22:11:24 -0500
commit5d50e0673fde8aabb2d87a75624b40d3b9c65df3 (patch)
tree7a005eed62f829a685e819229f37bea470264aaa /src
parentd010c3875b4a6b113f4f2099f201abbf1b8d4eb0 (diff)
fixed following a link to a video segment that triggers a navigation back to the source of the link
Diffstat (limited to 'src')
-rw-r--r--src/client/views/collections/CollectionStackedTimeline.tsx2
-rw-r--r--src/client/views/nodes/VideoBox.tsx6
2 files changed, 4 insertions, 4 deletions
diff --git a/src/client/views/collections/CollectionStackedTimeline.tsx b/src/client/views/collections/CollectionStackedTimeline.tsx
index 89da6692a..74bfc3a88 100644
--- a/src/client/views/collections/CollectionStackedTimeline.tsx
+++ b/src/client/views/collections/CollectionStackedTimeline.tsx
@@ -721,7 +721,7 @@ class StackedTimelineAnchor extends React.Component<StackedTimelineAnchorProps>
DocListCast(this.props.mark.links).length &&
time > NumCast(this.props.mark[this.props.startTag]) &&
time < NumCast(this.props.mark[this.props.endTag]) &&
- this._lastTimecode < NumCast(this.props.mark[this.props.startTag])
+ this._lastTimecode < NumCast(this.props.mark[this.props.startTag]) - 1e-5
) {
LinkManager.FollowLink(
undefined,
diff --git a/src/client/views/nodes/VideoBox.tsx b/src/client/views/nodes/VideoBox.tsx
index 615d595c0..ba7ecfec6 100644
--- a/src/client/views/nodes/VideoBox.tsx
+++ b/src/client/views/nodes/VideoBox.tsx
@@ -126,7 +126,7 @@ export class VideoBox extends ViewBoxAnnotatableComponent<ViewBoxAnnotatableProp
}
this._youtubePlayer && SelectionManager.DeselectAll(); // if we don't deselect the player, then we get an annoying YouTube spinner I guess telling us we're paused.
this._playTimer = undefined;
- this.updateTimecode();
+ this.props.renderDepth !== -1 && this.updateTimecode();
}
@action public FullScreen = () => {
@@ -542,8 +542,8 @@ export class VideoBox extends ViewBoxAnnotatableComponent<ViewBoxAnnotatableProp
trimStart={0}
trimEnd={this.duration}
trimDuration={this.duration}
- setStartTrim={() => { }}
- setEndTrim={() => { }}
+ setStartTrim={emptyFunction}
+ setEndTrim={emptyFunction}
/>
</div>;
}