[openmeetings] branch master updated: [OPENMEETINGS-2527] 'mic status' displayed, moderator can mute individual users

[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 e5e0f50  [OPENMEETINGS-2527] 'mic status' displayed, moderator can 
mute individual users
e5e0f50 is described below

commit e5e0f509349774588259843f05326c4dc4a87822
Author: Maxim Solodovnik <solomax...@gmail.com>
AuthorDate: Sat Nov 28 12:35:59 2020 +0700

    [OPENMEETINGS-2527] 'mic status' displayed, moderator can mute individual 
users
---
 .../src/main/java/org/apache/openmeetings/web/room/raw-video-util.js   | 3 ++-
 .../src/main/java/org/apache/openmeetings/web/room/raw-video.js        | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video-util.js
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video-util.js
index 050f58c..524509f 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video-util.js
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video-util.js
@@ -345,6 +345,7 @@ var Volume = (function() {
                video = _video;
                _destroy();
                const uid = video.stream().uid
+                       , cuid = video.stream().cuid
                        , volId = 'volume-' + uid;
                vol = OmUtil.tmpl('#volume-control-stub', volId)
                slider = vol.find('.slider');
@@ -356,7 +357,7 @@ var Volume = (function() {
                        })
                        .click(function(e) {
                                e.stopImmediatePropagation();
-                               OmUtil.roomAction({action: 'mute', uid: uid, 
mute: !muted});
+                               OmUtil.roomAction({action: 'mute', uid: cuid, 
mute: !muted});
                                _mute(!muted);
                                drop.hide();
                                return false;
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 089306f..b556209 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
@@ -475,10 +475,10 @@ var Video = (function() {
                states.push(state);
                if (sd.self) {
                        _createSendPeer(msg, state);
-                       _handleMicStatus(hasAudio);
                } else {
                        _createResvPeer(msg, state);
                }
+               _handleMicStatus(hasAudio);
        }
        function _setRights() {
                if (Room.hasRight(['MUTE_OTHERS']) && VideoUtil.hasMic(sd)) {