This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch 4.0.x
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/4.0.x by this push:
new 92f0cc6 [OPENMEETINGS-1142] video resolution in interview settings
fixed, add/remove audio right is improved
92f0cc6 is described below
commit 92f0cc6f0f317355e8029ed20a0f8e12d58ee934
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Tue Jul 17 00:20:39 2018 +0700
[OPENMEETINGS-1142] video resolution in interview settings fixed,
add/remove audio right is improved
---
.../java/org/apache/openmeetings/web/app/ClientManager.java | 2 +-
.../main/java/org/apache/openmeetings/web/room/RoomPanel.java | 2 +-
.../main/java/org/apache/openmeetings/web/room/settings.js | 11 ++++++-----
.../org/apache/openmeetings/web/room/sidebar/RoomSidebar.java | 6 +-----
4 files changed, 9 insertions(+), 12 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 ef1726d..99d7d73 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
@@ -99,10 +99,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 6e8e45d..6fd3e24 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
@@ -128,7 +128,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(cp,
r.getId(), _c.getSid())
.put("uid", _c.getUid())
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/settings.js
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/settings.js
index 08769bb..621cb6c 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/settings.js
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/settings.js
@@ -43,17 +43,17 @@ var VideoSettings = (function() {
{
text: vs.data('btn-save')
, icons: {
- primary: "ui-icon-disk"
+ primary: 'ui-icon-disk'
}
, click: function() {
_save(true);
- vs.dialog("close");
+ vs.dialog('close');
}
}
, {
text: vs.data('btn-cancel')
, click: function() {
- vs.dialog("close");
+ vs.dialog('close');
}
}
]
@@ -100,7 +100,7 @@ var VideoSettings = (function() {
playBtn.prop('disabled', false).button('refresh');
}
function _micActivity(level) {
- lm.progressbar("value", Math.max(0, level));
+ lm.progressbar('value', Math.max(0, level));
}
function _initSwf() {
const obj = swf.getDevices();
@@ -140,7 +140,8 @@ var VideoSettings = (function() {
}
});
_readValues();
- swf.init(s.video.cam, s.video.mic, s.video.width,
s.video.height);
+ swf.init(s.video.cam, s.video.mic
+ , o.interview ? 320 : s.video.width, o.interview ? 260
: s.video.height);
}
function _open() {
recAllowed = false;
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 c2f29fc..33b7574 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
@@ -170,11 +170,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);
