haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1576 from jitsi/remote_control_enabled 

fix(remotecontrol): Controller enabled property
This commit is contained in:
Любомир Маринов 2017-05-16 12:49:17 -05:00 committed by GitHub
parent bac191f96c 28ff188f96
commit 77ab05823d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/remotecontrol/Controller.js
View File

@ -97,7 +97,7 @@ export default class Controller extends RemoteControlParticipant {
* null(the participant has left). * null(the participant has left).
*/ */
requestPermissions(userId: string, eventCaptureArea: Object) { requestPermissions(userId: string, eventCaptureArea: Object) {
if (!this.enabled) { if (!this._enabled) {
return Promise.reject(new Error('Remote control is disabled!')); return Promise.reject(new Error('Remote control is disabled!'));
} }
@ -166,7 +166,7 @@ export default class Controller extends RemoteControlParticipant {
_handleReply(participant: Object, event: Object) { _handleReply(participant: Object, event: Object) {
const userId = participant.getId(); const userId = participant.getId();
if (this.enabled if (this._enabled
&& event.name === REMOTE_CONTROL_EVENT_NAME && event.name === REMOTE_CONTROL_EVENT_NAME
&& event.type === EVENT_TYPES.permissions && event.type === EVENT_TYPES.permissions
&& userId === this._requestedParticipant) { && userId === this._requestedParticipant) {
@ -205,7 +205,7 @@ export default class Controller extends RemoteControlParticipant {
* @returns {void} * @returns {void}
*/ */
_handleRemoteControlStoppedEvent(participant: Object, event: Object) { _handleRemoteControlStoppedEvent(participant: Object, event: Object) {
if (this.enabled if (this._enabled
&& event.name === REMOTE_CONTROL_EVENT_NAME && event.name === REMOTE_CONTROL_EVENT_NAME
&& event.type === EVENT_TYPES.stop && event.type === EVENT_TYPES.stop
&& participant.getId() === this._controlledParticipant) { && participant.getId() === this._controlledParticipant) {
@ -239,7 +239,7 @@ export default class Controller extends RemoteControlParticipant {
* @returns {void} * @returns {void}
*/ */
resume() { resume() {
if (!this.enabled || this._isCollectingEvents || !this._area) { if (!this._enabled || this._isCollectingEvents || !this._area) {
return; return;
} }
logger.log('Resuming remote control controller.'); logger.log('Resuming remote control controller.');