[openmeetings] branch master updated: [OPENMEETINGS-2451] mute-others should work as expected

[solomax]

This is an automated email from the ASF dual-hosted git repository.

solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git


The following commit(s) were added to refs/heads/master by this push:
     new 1bcd4c0  [OPENMEETINGS-2451] mute-others should work as expected
1bcd4c0 is described below

commit 1bcd4c01e6a1661c4244eaed4bf2158b312d2e12
Author: Maxim Solodovnik <solomax...@gmail.com>
AuthorDate: Wed Sep 23 16:40:59 2020 +0700

    [OPENMEETINGS-2451] mute-others should work as expected
---
 .../main/java/org/apache/openmeetings/web/room/raw-video-manager.js   | 4 ++--
 .../src/main/java/org/apache/openmeetings/web/room/raw-video.js       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video-manager.js
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video-manager.js
index 6398246..426a888 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video-manager.js
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video-manager.js
@@ -248,9 +248,9 @@ var VideoManager = (function() {
        }
        function _muteOthers(uid) {
                $(VID_SEL).each(function() {
-                       const w= $(this), v = w.data(), v2 = 
w.data('client-uid');
+                       const w = $(this), v = w.data(), v2 = 
w.data('client-uid');
                        if (v && v2) {
-                               v.mute('room' + uid !== v2);
+                               v.mute(uid !== v2);
                        }
                });
        }
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video.js 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video.js
index 91d57c7..3bab87a 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video.js
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video.js
@@ -461,8 +461,8 @@ var Video = (function() {
        }
        function _setRights() {
                if (Room.hasRight(['MUTE_OTHERS']) && VideoUtil.hasMic(sd)) {
-                       muteOthers.addClass('enabled').click(function() {
-                               VideoManager.clickMuteOthers(sd.uid);
+                       muteOthers.addClass('enabled').off().click(function() {
+                               VideoManager.clickMuteOthers(sd.cuid);
                        });
                } else {
                        muteOthers.removeClass('enabled').off();