diff options
| author | yipstanley <stanley_yip@brown.edu> | 2019-07-12 13:15:48 -0400 |
|---|---|---|
| committer | yipstanley <stanley_yip@brown.edu> | 2019-07-12 13:15:48 -0400 |
| commit | 2dfc3abde7a353005e0f211adcb1ca993ce6cba1 (patch) | |
| tree | c6d453b592efdc19c165153dfd92726fa5464179 /src/client/views/nodes/VideoBox.tsx | |
| parent | cae397d6bba9253295d0627c3839ec33e69946c5 (diff) | |
| parent | bde549beec0b9644ff0e39585989b1a6795750eb (diff) | |
Merge branch 'master' of https://github.com/browngraphicslab/Dash-Web
Diffstat (limited to 'src/client/views/nodes/VideoBox.tsx')
| -rw-r--r-- | src/client/views/nodes/VideoBox.tsx | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/client/views/nodes/VideoBox.tsx b/src/client/views/nodes/VideoBox.tsx index a5e145856..c65dfe0bd 100644 --- a/src/client/views/nodes/VideoBox.tsx +++ b/src/client/views/nodes/VideoBox.tsx @@ -148,14 +148,9 @@ export class VideoBox extends DocComponent<FieldViewProps, VideoDocument>(VideoD let interactive = InkingControl.Instance.selectedTool ? "" : "-interactive"; let style = "videoBox-cont" + (this._fullScreen ? "-fullScreen" : interactive); return !field ? <div>Loading</div> : - VideoBox._showControls ? - <video className={`${style}`} ref={this.setVideoRef} onCanPlay={this.videoLoad} onPointerDown={this.onPointerDown} onContextMenu={this.specificContextMenu} controls> - <source src={field.url.href} type="video/mp4" /> - Not supported. - </video> : - <video className={`${style}`} ref={this.setVideoRef} onCanPlay={this.videoLoad} onPointerDown={this.onPointerDown} onContextMenu={this.specificContextMenu}> - <source src={field.url.href} type="video/mp4" /> - Not supported. + <video className={`${style}`} ref={this.setVideoRef} onCanPlay={this.videoLoad} onPointerDown={this.onPointerDown} onContextMenu={this.specificContextMenu} controls={VideoBox._showControls}> + <source src={field.url.href} type="video/mp4" /> + Not supported. </video>; } }
\ No newline at end of file |