aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/client/views/nodes/ScreenshotBox.tsx12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/client/views/nodes/ScreenshotBox.tsx b/src/client/views/nodes/ScreenshotBox.tsx
index 3c281086a..9d64aaa35 100644
--- a/src/client/views/nodes/ScreenshotBox.tsx
+++ b/src/client/views/nodes/ScreenshotBox.tsx
@@ -123,12 +123,13 @@ export class ScreenshotBox extends ViewBoxAnnotatableComponent<ViewBoxAnnotatabl
constructor(props: any) {
super(props);
- if (!this.rootDoc.videoWall) this.setupDictation();
- else {
+ if (this.rootDoc.videoWall) {
this.rootDoc.nativeWidth = undefined;
this.rootDoc.nativeHeight = undefined;
this.layoutDoc.popOff = 0;
this.layoutDoc.popOut = 1;
+ } else {
+ this.setupDictation();
}
}
getAnchor = () => {
@@ -174,15 +175,16 @@ export class ScreenshotBox extends ViewBoxAnnotatableComponent<ViewBoxAnnotatabl
}
@computed get content() {
+ if (this.rootDoc.videoWall) return (null);
const interactive = CurrentUserUtils.SelectedTool !== InkTool.None || !this.props.isSelected() ? "" : "-interactive";
return <video className={"videoBox-content" + interactive} key="video"
ref={r => {
this._videoRef = r;
setTimeout(() => {
- if (this.rootDoc.mediaState === "pendingRecording" && this._videoRef) { // TODO glr: use mediaState
+ if (this.rootDoc.mediaState === "pendingRecording" && this._videoRef) {
this.toggleRecording();
}
- }, 1000);
+ }, 100);
}}
autoPlay={this._screenCapture}
style={{ width: this._screenCapture ? "100%" : undefined, height: this._screenCapture ? "100%" : undefined }}
@@ -191,7 +193,7 @@ export class ScreenshotBox extends ViewBoxAnnotatableComponent<ViewBoxAnnotatabl
onClick={e => e.preventDefault()}>
<source type="video/mp4" />
Not supported.
- </video>;
+ </video>;
}
_numScreens = 5;