diff options
| author | bobzel <zzzman@gmail.com> | 2023-04-17 11:18:37 -0400 |
|---|---|---|
| committer | bobzel <zzzman@gmail.com> | 2023-04-17 11:18:37 -0400 |
| commit | 4c803d0556aec2e06387a86cc84069577bebd5c9 (patch) | |
| tree | b90cf1dea76f51e273e9c11f9084cf6ce02b9f77 /src/client/views/nodes/VideoBox.tsx | |
| parent | cd30c14116bbbab16c21a7ecc31090d2b4bf413f (diff) | |
| parent | 8127616d06b4db2b29de0b13068810fd19e77b5e (diff) | |
Merge branch 'master' into pres-trail-sophie
Diffstat (limited to 'src/client/views/nodes/VideoBox.tsx')
| -rw-r--r-- | src/client/views/nodes/VideoBox.tsx | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/client/views/nodes/VideoBox.tsx b/src/client/views/nodes/VideoBox.tsx index b144c9318..7a7d4fe37 100644 --- a/src/client/views/nodes/VideoBox.tsx +++ b/src/client/views/nodes/VideoBox.tsx @@ -963,7 +963,6 @@ export class VideoBox extends ViewBoxAnnotatableComponent<ViewBoxAnnotatableProp startTag={'_timecodeToShow' /* videoStart */} endTag={'_timecodeToHide' /* videoEnd */} bringToFront={emptyFunction} - CollectionView={undefined} playFrom={this.playFrom} setTime={this.setPlayheadTime} playing={this.playing} @@ -1074,7 +1073,6 @@ export class VideoBox extends ViewBoxAnnotatableComponent<ViewBoxAnnotatableProp NativeHeight={returnZero} renderDepth={this.props.renderDepth + 1} fieldKey={this.annotationKey} - CollectionView={undefined} isAnnotationOverlay={true} annotationLayerHostsContent={true} PanelWidth={this.panelWidth} |
