diff --git a/src/components/media-views.js b/src/components/media-views.js index 49eae14a33263aed6b8955d4afe9d46b1eaa7a42..1043c6b49b6e6ef9f01ccfba1c6ed333ca140999 100644 --- a/src/components/media-views.js +++ b/src/components/media-views.js @@ -328,6 +328,7 @@ AFRAME.registerComponent("media-video", { } if (!src.startsWith("webrtc://")) { + // TODO FF error here if binding mediastream: The captured HTMLMediaElement is playing a MediaStream. Applying volume or mute status is not currently supported -- not an issue since we have no audio atm in shared video. texture.audioSource = this.el.sceneEl.audioListener.context.createMediaElementSource(texture.image); const sound = new THREE.PositionalAudio(this.el.sceneEl.audioListener); diff --git a/src/react-components/ui-root.js b/src/react-components/ui-root.js index 56889d422f9e5ee4071fb7df920261cc2b624670..677c8b4f6865b9eb823e38ea7d29541a61845fd5 100644 --- a/src/react-components/ui-root.js +++ b/src/react-components/ui-root.js @@ -23,7 +23,7 @@ import ProfileEntryPanel from "./profile-entry-panel"; import HelpDialog from "./help-dialog.js"; import SafariDialog from "./safari-dialog.js"; import WebVRRecommendDialog from "./webvr-recommend-dialog.js"; -import WebRTCScreenshareDialog from "./webrtc-screenshare-dialog.js"; +import WebRTCScreenshareUnsupportedDialog from "./webrtc-screenshare-unsupported-dialog.js"; import InviteTeamDialog from "./invite-team-dialog.js"; import InviteDialog from "./invite-dialog.js"; import LinkDialog from "./link-dialog.js"; @@ -567,8 +567,8 @@ class UIRoot extends Component { this.setState({ dialog: <WebVRRecommendDialog onClose={this.closeDialog} /> }); }; - showWebRTCScreenshareDialog = () => { - this.setState({ dialog: <WebRTCScreenshareDialog onClose={this.closeDialog} /> }); + showWebRTCScreenshareUnsupportedDialog = () => { + this.setState({ dialog: <WebRTCScreenshareUnsupportedDialog onClose={this.closeDialog} /> }); }; onMiniInviteClicked = () => { @@ -1156,7 +1156,7 @@ class UIRoot extends Component { onToggleSpaceBubble={this.toggleSpaceBubble} onShareVideo={this.shareVideo} onEndShareVideo={this.endShareVideo} - onShareVideoNotCapable={() => this.showWebRTCScreenshareDialog()} + onShareVideoNotCapable={() => this.showWebRTCScreenshareUnsupportedDialog()} onSpawnPen={this.spawnPen} onSpawnCamera={() => this.props.scene.emit("action_spawn_camera")} /> diff --git a/src/react-components/webrtc-screenshare-dialog.js b/src/react-components/webrtc-screenshare-unsupported-dialog.js similarity index 77% rename from src/react-components/webrtc-screenshare-dialog.js rename to src/react-components/webrtc-screenshare-unsupported-dialog.js index fdc35d43dbc10cdbb44e50afb7deba07663fcf3a..c77148695c0ecf689d76fb31f924fff65ed7cd3d 100644 --- a/src/react-components/webrtc-screenshare-dialog.js +++ b/src/react-components/webrtc-screenshare-unsupported-dialog.js @@ -1,12 +1,16 @@ import React, { Component } from "react"; import DialogContainer from "./dialog-container.js"; -export default class WebRTCScreenshareDialog extends Component { +export default class WebRTCScreenshareUnsupportedDialog extends Component { render() { return ( <DialogContainer title="Share Screen" {...this.props}> <div style={{ display: "flex", flexDirection: "column", alignItems: "center" }}> - <p>To share your screen, you can use Firefox.</p> + <p> + Your browser doesn't seem to support WebRTC screen sharing. + <br /> + To share your screen in Hubs, you can use Firefox. + </p> <a className="info-dialog--action-button" target="_blank"