diff options
author | Mohammad Amoush <mohammad_amoush@brown.edu> | 2019-10-29 18:52:26 -0400 |
---|---|---|
committer | Mohammad Amoush <mohammad_amoush@brown.edu> | 2019-10-29 18:52:26 -0400 |
commit | d97091421468238d32edf55c240bfb3b021e9e05 (patch) | |
tree | 40d7fde0e1181749a50ccdee4936199938252973 /src | |
parent | 9c7521a36f67b3a69ac40f8a55e66638ed96bf04 (diff) |
couple fixes
Diffstat (limited to 'src')
-rw-r--r-- | src/client/views/nodes/DocumentContentsView.tsx | 4 | ||||
-rw-r--r-- | src/client/views/webcam/DashWebRTCVideo.tsx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/client/views/nodes/DocumentContentsView.tsx b/src/client/views/nodes/DocumentContentsView.tsx index f1678d4f9..ee58e4152 100644 --- a/src/client/views/nodes/DocumentContentsView.tsx +++ b/src/client/views/nodes/DocumentContentsView.tsx @@ -34,7 +34,7 @@ import { StrCast, NumCast } from "../../../new_fields/Types"; import { List } from "../../../new_fields/List"; import { fromPromise } from "mobx-utils"; import { DashWebCam } from "../../views/webcam/DashWebCam"; -import { DashWebRTC } from "../webcam/DashWebRTC"; +import { DashWebRTCVideo } from "../webcam/DashWebRTCVideo"; const JsxParser = require('react-jsx-parser').default; //TODO Why does this need to be imported like this? @@ -107,7 +107,7 @@ export class DocumentContentsView extends React.Component<DocumentViewProps & { if (!this.layout && this.props.layoutKey !== "overlayLayout") return (null); return <ObserverJsxParser blacklistedAttrs={[]} - components={{ FormattedTextBox, ImageBox, IconBox, DirectoryImportBox, DragBox, ButtonBox, FieldView, CollectionFreeFormView, CollectionDockingView, CollectionSchemaView, CollectionView, CollectionPDFView, CollectionVideoView, WebBox, KeyValueBox, PDFBox, VideoBox, AudioBox, HistogramBox, PresBox, YoutubeBox, LinkFollowBox, PresElementBox, DashWebCam, DashWebRTC }} + components={{ FormattedTextBox, ImageBox, IconBox, DirectoryImportBox, DragBox, ButtonBox, FieldView, CollectionFreeFormView, CollectionDockingView, CollectionSchemaView, CollectionView, CollectionPDFView, CollectionVideoView, WebBox, KeyValueBox, PDFBox, VideoBox, AudioBox, HistogramBox, PresBox, YoutubeBox, LinkFollowBox, PresElementBox, DashWebCam, DashWebRTCVideo }} bindings={this.CreateBindings()} jsx={this.finalLayout} showWarnings={true} diff --git a/src/client/views/webcam/DashWebRTCVideo.tsx b/src/client/views/webcam/DashWebRTCVideo.tsx index db9c922fc..5bb7cef6f 100644 --- a/src/client/views/webcam/DashWebRTCVideo.tsx +++ b/src/client/views/webcam/DashWebRTCVideo.tsx @@ -8,7 +8,7 @@ import { InkingControl } from "../InkingControl"; import "../../views/nodes/WebBox.scss"; import "./DashWebRTC.scss"; import adapter from 'webrtc-adapter'; -import { DashWebRTC } from "./DashWebRTC"; +//import { DashWebRTC } from "./DashWebRTC"; @@ -37,7 +37,7 @@ export class DashWebRTCVideo extends React.Component<CollectionFreeFormDocumentV private hangupButton: HTMLButtonElement | undefined; componentDidMount() { - DashWebRTC.setVideoObjects(this.localVideoEl!, this.peerVideoEl!); + //DashWebRTC.setVideoObjects(this.localVideoEl!, this.peerVideoEl!); } |