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

Merge pull request #3893 from antobinary/check-mute-user

Browse Source 
HTML5: Update callServer to makeCall to fix user item calls
This commit is contained in:
Anton Georgiev 2017-05-03 13:54:15 -04:00 committed by GitHub
commit 6d71e943a0
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bigbluebutton-html5/imports/ui/components/user-list/component.jsx
View File

@ -110,7 +110,7 @@ class UserList extends Component {
currentUser,
isBreakoutRoom,
intl,
callServer,
makeCall,
} = this.props;
const userActions = {
@ -121,27 +121,27 @@ class UserList extends Component {
},
clearStatus: {
label: intl.formatMessage(intlMessages.ClearStatusLabel),
handler: user => callServer('setEmojiStatus', user.id, 'none'),
handler: user => makeCall('setEmojiStatus', user.id, 'none'),
icon: 'clear_status',
},
setPresenter: {
label: intl.formatMessage(intlMessages.MakePresenterLabel),
handler: user => callServer('assignPresenter', user.id),
handler: user => makeCall('assignPresenter', user.id),
icon: 'presentation',
},
kick: {
label: intl.formatMessage(intlMessages.KickUserLabel),
handler: user => callServer('kickUser', user.id),
handler: user => makeCall('kickUser', user.id),
icon: 'circle_close',
},
mute: {
label: intl.formatMessage(intlMessages.MuteUserAudioLabel),
handler: user => callServer('muteUser', user.id),
handler: user => makeCall('muteUser', user.id),
icon: 'audio_off',
},
unmute: {
label: intl.formatMessage(intlMessages.UnmuteUserAudioLabel),
handler: user => callServer('unmuteUser', user.id),
handler: user => makeCall('unmuteUser', user.id),
icon: 'audio_on',
},
};

4
bigbluebutton-html5/imports/ui/components/user-list/container.jsx
View File

@ -1,7 +1,7 @@
import React, { Component } from 'react';
import { createContainer } from 'meteor/react-meteor-data';
import { meetingIsBreakout } from '/imports/ui/components/app/service';
import { callServer } from '/imports/ui/services/api';
import { makeCall } from '/imports/ui/services/api';
import Service from './service.js';
import UserList from './component.jsx';
@ -27,7 +27,7 @@ class UserListContainer extends Component {
openChats={openChats}
openChat={openChat}
isBreakoutRoom={isBreakoutRoom}
callServer={callServer}
makeCall={makeCall}
userActions={userActions}>
{children}
</UserList>