diff options
| -rw-r--r-- | src/client/views/nodes/CollectionFreeFormDocumentView.tsx | 2 | ||||
| -rw-r--r-- | src/client/views/nodes/DocumentView.tsx | 2 | ||||
| -rw-r--r-- | src/client/views/webcam/DashWebRTC.ts | 8 | ||||
| -rw-r--r-- | src/server/index.ts | 5 |
4 files changed, 10 insertions, 7 deletions
diff --git a/src/client/views/nodes/CollectionFreeFormDocumentView.tsx b/src/client/views/nodes/CollectionFreeFormDocumentView.tsx index a035bdc3d..c2c402819 100644 --- a/src/client/views/nodes/CollectionFreeFormDocumentView.tsx +++ b/src/client/views/nodes/CollectionFreeFormDocumentView.tsx @@ -84,7 +84,7 @@ export class CollectionFreeFormDocumentView extends DocComponent<CollectionFreeF finalPanelHeight = () => this.dataProvider ? this.dataProvider.height : this.panelHeight(); render() { - trace(); + //trace(); return <div className="collectionFreeFormDocumentView-container" style={{ boxShadow: diff --git a/src/client/views/nodes/DocumentView.tsx b/src/client/views/nodes/DocumentView.tsx index 54a687c34..e76a83e5e 100644 --- a/src/client/views/nodes/DocumentView.tsx +++ b/src/client/views/nodes/DocumentView.tsx @@ -579,7 +579,7 @@ export class DocumentView extends DocComponent<DocumentViewProps, Document>(Docu render() { if (!this.props.Document) return (null); - trace(); + // trace(); const animDims = this.Document.animateToDimensions ? Array.from(this.Document.animateToDimensions) : undefined; const ruleColor = this.props.ruleProvider ? StrCast(this.props.ruleProvider["ruleColor_" + this.Document.heading]) : undefined; const ruleRounding = this.props.ruleProvider ? StrCast(this.props.ruleProvider["ruleRounding_" + this.Document.heading]) : undefined; diff --git a/src/client/views/webcam/DashWebRTC.ts b/src/client/views/webcam/DashWebRTC.ts index 846de4115..c61469cb8 100644 --- a/src/client/views/webcam/DashWebRTC.ts +++ b/src/client/views/webcam/DashWebRTC.ts @@ -19,6 +19,7 @@ export namespace DashWebRTC { let turnReady; let localVideo: HTMLVideoElement; let remoteVideo: HTMLVideoElement; + let curRoom: string = ""; let pcConfig = { @@ -35,6 +36,8 @@ export namespace DashWebRTC { export function init(room: string) { + curRoom = room; + if (room !== '') { DocServer._socket.emit('create or join', room); console.log('Attempted to create or join room', room); @@ -73,7 +76,6 @@ export namespace DashWebRTC { if (message.message === 'got user media') { maybeStart(); } else if (message.message.type === 'offer') { - console.log("I have entered here bro!!!"); if (!isInitiator && !isStarted) { maybeStart(); } @@ -82,7 +84,7 @@ export namespace DashWebRTC { } else if (message.message.type === 'answer' && isStarted) { pc.setRemoteDescription(new RTCSessionDescription(message.message)); } else if (message.message.type === 'candidate' && isStarted) { - var candidate = new RTCIceCandidate({ + let candidate = new RTCIceCandidate({ sdpMLineIndex: message.message.label, candidate: message.message.candidate }); @@ -123,7 +125,7 @@ export namespace DashWebRTC { function sendMessage(message: any) { console.log('Client sending message: ', message); - Utils.Emit(DocServer._socket, MessageStore.NotifyRoommates, { message: message, room: "" }); + Utils.Emit(DocServer._socket, MessageStore.NotifyRoommates, { message: message, room: curRoom }); //DocServer._socket.emit('message', message); } diff --git a/src/server/index.ts b/src/server/index.ts index 77f048a1e..93d257721 100644 --- a/src/server/index.ts +++ b/src/server/index.ts @@ -983,8 +983,9 @@ function HandleYoutubeQuery([query, callback]: [YoutubeQueryInput, (result?: any } function HandleRoommateNotification(socket: Socket, message: RoomMessage) { - socket.broadcast.emit('message', message); - //server.sockets.in(message.room).emit('message', message.message); + //socket.broadcast.emit('message', message); + console.log("The room that sent this: ", message.room, " and message is : ", message.message); + server.sockets.in(message.room).emit('message', message); } |