diff options
| author | kimdahey <claire_kim1@brown.edu> | 2019-11-03 17:07:18 -0500 |
|---|---|---|
| committer | kimdahey <claire_kim1@brown.edu> | 2019-11-03 17:07:18 -0500 |
| commit | b1e9619a4e04a9784d927c766361d734f549d6c5 (patch) | |
| tree | 36b875ccc0c45c3706d2533c4c28cc1492b38ce5 /src/client/views/webcam | |
| parent | b2777f92b50f926357ad9b595c7907368b996fbd (diff) | |
| parent | 2786a2e4b33ff874f320697b89fecec3105df201 (diff) | |
Merge branch 'master' of https://github.com/browngraphicslab/Dash-Web into webcam_mohammad
Diffstat (limited to 'src/client/views/webcam')
| -rw-r--r-- | src/client/views/webcam/DashWebCam.tsx | 5 | ||||
| -rw-r--r-- | src/client/views/webcam/DashWebRTCVideo.tsx | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/client/views/webcam/DashWebCam.tsx b/src/client/views/webcam/DashWebCam.tsx index 351913562..a9669750f 100644 --- a/src/client/views/webcam/DashWebCam.tsx +++ b/src/client/views/webcam/DashWebCam.tsx @@ -308,8 +308,7 @@ export class DashWebCam extends React.Component<CollectionFreeFormDocumentViewPr - public static LayoutString() { return FieldView.LayoutString(DashWebCam); } - + public static LayoutString(fieldKey: string) { return FieldView.LayoutString(DashWebCam, fieldKey); } render() { const { state, props } = this; @@ -328,8 +327,6 @@ export class DashWebCam extends React.Component<CollectionFreeFormDocumentViewPr videoConstraints, imageSmoothing, fieldKey, - fieldExt, - leaveNativeSize, fitToBox, ContainingCollectionView, Document, diff --git a/src/client/views/webcam/DashWebRTCVideo.tsx b/src/client/views/webcam/DashWebRTCVideo.tsx index dcaa87557..62efd9730 100644 --- a/src/client/views/webcam/DashWebRTCVideo.tsx +++ b/src/client/views/webcam/DashWebRTCVideo.tsx @@ -290,7 +290,8 @@ export class DashWebRTCVideo extends React.Component<CollectionFreeFormDocumentV - public static LayoutString() { return FieldView.LayoutString(DashWebRTCVideo); } + public static LayoutString(fieldKey: string) { return FieldView.LayoutString(DashWebRTCVideo, fieldKey); } + _ignore = 0; |