[openmeetings] branch master updated: [OPENMEETINGS-1142] video resolution in interview settings fixed, add/remove audio right is improved

[so...@apache.org]

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 2cf265f  [OPENMEETINGS-1142] video resolution in interview settings fixed, add/remove audio right is improved
2cf265f is described below

commit 2cf265f8436338a687a2dd54ec35fc752ef5ecdf
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Tue Jul 17 00:20:39 2018 +0700

    [OPENMEETINGS-1142] video resolution in interview settings fixed, add/remove audio right is improved
---
 .../main/java/org/apache/openmeetings/web/app/ClientManager.java    | 2 +-
 .../src/main/java/org/apache/openmeetings/web/room/RoomPanel.java   | 2 +-
 .../src/main/java/org/apache/openmeetings/web/room/settings-base.js | 6 +++---
 .../java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java  | 6 +-----
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/ClientManager.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/ClientManager.java
index f8b2f5b..f527e5d 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/ClientManager.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/ClientManager.java
@@ -96,10 +96,10 @@ public class ClientManager implements IClientManager {
 
 	@Override
 	public Client update(Client c) {
-		map().put(c.getUid(), c);
 		synchronized (onlineClients) {
 			onlineClients.get(c.getUid()).merge(c);
 		}
+		map().put(c.getUid(), c);
 		return c;
 	}
 
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
index a4791b0..17c33be 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
@@ -127,7 +127,7 @@ public class RoomPanel extends BasePanel {
 					ConferenceLog.Type.roomEnter
 					, getUserId(), "0", r.getId()
 					, cp.getRemoteAddress()
-					, "" + r.getId());
+					, String.valueOf(r.getId()));
 			Client _c = getClient();
 			JSONObject options = VideoSettings.getInitJson(_c.getSid())
 					.put("uid", _c.getUid())
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/settings-base.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/settings-base.js
index eab8c49..3c8fa08 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/settings-base.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/settings-base.js
@@ -97,7 +97,7 @@ var VideoSettings = (function() {
 	}
 	function _close() {
 		_clear();
-		Wicket.Event.unsubscribe("/websocket/message", _onWsMessage);
+		Wicket.Event.unsubscribe('/websocket/message', _onWsMessage);
 	}
 	function _onIceCandidate(candidate) {
 		OmUtil.log('Local candidate' + JSON.stringify(candidate));
@@ -289,7 +289,7 @@ var VideoSettings = (function() {
 	}
 	function _initDevices() {
 		if (!navigator.mediaDevices || !navigator.mediaDevices.enumerateDevices) {
-			OmUtil.error("enumerateDevices() not supported.");
+			OmUtil.error('enumerateDevices() not supported.');
 			return;
 		}
 		cam.find('option[value!="-1"]').remove();
@@ -348,7 +348,7 @@ var VideoSettings = (function() {
 			});
 	}
 	function _open() {
-		Wicket.Event.subscribe("/websocket/message", _onWsMessage);
+		Wicket.Event.subscribe('/websocket/message', _onWsMessage);
 		recAllowed = false;
 		timer.hide();
 		playBtn.prop('disabled', true).button('refresh');
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
index 60b94fb..4a6fe8d 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
@@ -168,11 +168,7 @@ public class RoomSidebar extends Panel {
 						return;
 					}
 					if (client.hasRight(right)) {
-						if (Right.audio == right) {
-							room.denyRight(client, right, Right.video);
-						} else {
-							room.denyRight(client, right);
-						}
+						room.denyRight(client, right);
 					} else {
 						if (Right.video == right) {
 							room.allowRight(client, Right.audio, right);