aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgeireann <geireann.lindfield@gmail.com>2021-08-25 23:56:23 -0400
committergeireann <geireann.lindfield@gmail.com>2021-08-25 23:56:23 -0400
commit8394f2f5f2a70c40a1fb8c6a1f995c22cca6bfe1 (patch)
tree7c80b818ff96f478b37fcaf6b0ee7887fad13873
parentd5ee7f7436aaf3a50275379ff986cb3546d6f6a0 (diff)
parent610f197693271c8d2a80c980f9abd5e6f68ce3f5 (diff)
Merge branch 'temporalmedia-mehek' into menu_updates_geireann
-rw-r--r--src/client/views/nodes/VideoBox.tsx10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/client/views/nodes/VideoBox.tsx b/src/client/views/nodes/VideoBox.tsx
index d4df30b48..d16b28f32 100644
--- a/src/client/views/nodes/VideoBox.tsx
+++ b/src/client/views/nodes/VideoBox.tsx
@@ -323,8 +323,8 @@ export class VideoBox extends ViewBoxAnnotatableComponent<ViewBoxAnnotatableProp
{!this.audiopath || this.audiopath === field.url.href ? (null) :
<audio ref={this.setAudioRef} className={`audiobox-control${this.isContentActive() ? "-interactive" : ""}`}>
<source src={this.audiopath} type="audio/mpeg" />
- Not supported.
- </audio>}
+ Not supported.
+ </audio>}
</div>
</div>;
}
@@ -537,6 +537,12 @@ export class VideoBox extends ViewBoxAnnotatableComponent<ViewBoxAnnotatableProp
isContentActive={this.isContentActive}
playLink={this.playLink}
PanelHeight={this.timelineHeight}
+ trimming={false}
+ trimStart={0}
+ trimEnd={this.duration}
+ trimDuration={this.duration}
+ setStartTrim={() => { }}
+ setEndTrim={() => { }}
/>
</div>;
}