BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed incorrect fetching of userId in the video-dock component

Browse Source
This commit is contained in:
prlanzarin 2018-01-12 18:39:16 +00:00
parent 9ff881f138
commit 4fc1e3ea85
3 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
bigbluebutton-html5/imports/ui/components/video-dock/component.jsx
View File

@ -78,11 +78,10 @@ export default class VideoDock extends Component {
componentDidMount() {
const ws = this.ws;
const { users } = this.props;
const id = users[0].userId;
const { users, userId } = this.props;
for (let i = 0; i < users.length; i++) {
if (users[i].has_stream && users[i].userId !== id) {
if (users[i].has_stream && users[i].userId !== userId) {
this.start(users[i].userId, false);
}
}
@ -304,7 +303,7 @@ export default class VideoDock extends Component {
const { users } = this.props;
this.sendMessage({
type: 'video',
role: id == users[0].userId ? 'share' : 'viewer',
role: id == this.props ? 'share' : 'viewer',
id: 'stop',
cameraId: id,
});
@ -350,11 +349,10 @@ export default class VideoDock extends Component {
}
shareWebcam() {
const { users } = this.props;
const id = users[0].userId;
const { users, userId } = this.props;
if (this.connectedToMediaServer()) {
this.start(id, true);
this.start(userId, true);
} else {
log("error", "Not connected to media server BRA");
}
@ -362,9 +360,8 @@ export default class VideoDock extends Component {
unshareWebcam() {
log('info', 'Unsharing webcam');
const { users } = this.props;
const id = users[0].userId;
this.sendUserUnshareWebcam(id);
const { users, userId } = this.props;
this.sendUserUnshareWebcam(userId);
}
startResponse(message) {
@ -423,7 +420,7 @@ export default class VideoDock extends Component {
const { users } = this.props;
if (message.cameraId == users[0].userId) {
if (message.cameraId == this.props) {
this.unshareWebcam();
} else {
this.stop(message.cameraId);
@ -466,9 +463,8 @@ export default class VideoDock extends Component {
}
shouldComponentUpdate(nextProps, nextState) {
const { users } = this.props;
const { users, userId } = this.props;
const nextUsers = nextProps.users;
const id = users[0].userId;
if (users) {
let suc = false;
@ -480,7 +476,7 @@ export default class VideoDock extends Component {
console.log(`User ${nextUsers[i].has_stream ? '' : 'un'}shared webcam ${users[i].userId}`);
if (nextUsers[i].has_stream) {
if (id !== users[i].userId) {
if (userId !== users[i].userId) {
this.start(users[i].userId, false);
}
} else {

1
bigbluebutton-html5/imports/ui/components/video-dock/container.jsx
View File

@ -13,4 +13,5 @@ export default withTracker(() => ({
sendUserShareWebcam: VideoService.sendUserShareWebcam,
sendUserUnshareWebcam: VideoService.sendUserUnshareWebcam,
users: VideoService.getAllUsers(),
userId: VideoService.userId,
}))(VideoDockContainer);

4
bigbluebutton-html5/imports/ui/components/video-dock/service.js
View File

@ -1,5 +1,6 @@
import { makeCall } from '/imports/ui/services/api';
import Users from '/imports/api/users';
import Auth from '/imports/ui/services/auth';
const joinVideo = () => {
const joinVideoEvent = new Event('joinVideo');
@ -21,6 +22,9 @@ const sendUserUnshareWebcam = (stream) => {
const getAllUsers = () => Users.find().fetch();
const userId = Auth.userID;
export default {
sendUserShareWebcam, sendUserUnshareWebcam, joinVideo, exitVideo, getAllUsers,
userId,
};