diff options
| author | bobzel <zzzman@gmail.com> | 2022-03-09 16:52:33 -0500 |
|---|---|---|
| committer | bobzel <zzzman@gmail.com> | 2022-03-09 16:52:33 -0500 |
| commit | 8e50058e1a41809f82b60300e9b03637f0a15159 (patch) | |
| tree | 5557c802b8750b0d2fe7db2fa03b27c5d6cf5887 | |
| parent | c21919a2105bd1ed4f060be149624d064739a36c (diff) | |
| parent | 5d50e0673fde8aabb2d87a75624b40d3b9c65df3 (diff) | |
Merge branch 'master' into speedups2
| -rw-r--r-- | src/client/views/collections/CollectionStackedTimeline.tsx | 2 | ||||
| -rw-r--r-- | src/client/views/nodes/VideoBox.tsx | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/client/views/collections/CollectionStackedTimeline.tsx b/src/client/views/collections/CollectionStackedTimeline.tsx index 642c0524c..e09e9aa35 100644 --- a/src/client/views/collections/CollectionStackedTimeline.tsx +++ b/src/client/views/collections/CollectionStackedTimeline.tsx @@ -715,7 +715,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 036b3ba14..33fdc4935 100644 --- a/src/client/views/nodes/VideoBox.tsx +++ b/src/client/views/nodes/VideoBox.tsx @@ -120,7 +120,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 = () => { @@ -538,8 +538,8 @@ export class VideoBox extends ViewBoxAnnotatableComponent<ViewBoxAnnotatableProp trimStart={0} trimEnd={this.duration} trimDuration={this.duration} - setStartTrim={() => { }} - setEndTrim={() => { }} + setStartTrim={emptyFunction} + setEndTrim={emptyFunction} /> </div>; } |