You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2020/10/03 14:10:57 UTC
[openmeetings] branch master updated: [OPENMEETINGS-2466] code
clean-up
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 fbfb6d2 [OPENMEETINGS-2466] code clean-up
fbfb6d2 is described below
commit fbfb6d2b0b939b15ca311b79998b38d488746b24
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Sat Oct 3 21:10:09 2020 +0700
[OPENMEETINGS-2466] code clean-up
---
.../db/dao/basic/ConfigurationDao.java | 2 +-
.../apache/openmeetings/web/room/raw-settings.js | 27 ++++++++--------------
.../org/apache/openmeetings/web/room/raw-video.js | 9 ++++----
3 files changed, 15 insertions(+), 23 deletions(-)
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
index 3871588..b81a447 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
@@ -589,7 +589,7 @@ public class ConfigurationDao implements IDataProviderDao<Configuration> {
for(String str : val.split(",")) {
if (!Strings.isEmpty(str)) {
try {
- cspConfig.add(key, str.trim());
+ cspConfig.add(key, str.trim());
} catch (Exception e) {
log.error("Enexpected error while adding CSP rule: key '{}', value '{}', part '{}'", key, val, str, e);
}
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-settings.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-settings.js
index 72fb92c..3ff9a23 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-settings.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-settings.js
@@ -372,20 +372,15 @@ var VideoSettings = (function() {
return;
}
navigator.mediaDevices.enumerateDevices()
- .then(function(devices) {
- devices.forEach(function(device) {
+ .then(devices => devices.forEach(device => {
if (DEV_AUDIO === device.kind) {
devCnts.audio = true;
} else if (DEV_VIDEO === device.kind) {
devCnts.video = true;
}
- });
- callback(devCnts);
- })
- .catch(function() {
- OmUtil.error('Unable to get the list of multimedia devices');
- callback(devCnts);
- });
+ }))
+ .catch(() => OmUtil.error('Unable to get the list of multimedia devices'))
+ .finally(() => callback(devCnts));
}
function _initDevices() {
if (window.isSecureContext === false) {
@@ -404,23 +399,19 @@ var VideoSettings = (function() {
return;
}
navigator.mediaDevices.getUserMedia(devCnts)
- .then(function(stream) {
+ .then(stream => {
const devices = navigator.mediaDevices.enumerateDevices()
- .then(function(devices) {
- _clear(stream);
- return devices;
- })
.catch(function(err) {
- _clear(stream);
throw err;
- });
+ })
+ .finally(() => _clear(stream));
return devices;
})
- .then(function(devices) {
+ .then(devices => {
let cCount = 0, mCount = 0;
_load();
_setDisabled([cam, mic]);
- devices.forEach(function(device) {
+ devices.forEach(device => {
if (DEV_AUDIO === device.kind) {
const o = $('<option></option>').attr('value', mCount).text(device.label)
.data('device-id', device.deviceId);
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 3bab87a..db083a4 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
@@ -49,7 +49,7 @@ var Video = (function() {
throw 'Screen-sharing is not supported in ' + b.name + '[' + b.major + ']';
});
}
- promise.then(function(stream) {
+ promise.then(stream => {
if (!state.disposed) {
__createVideo(state);
state.stream = stream;
@@ -73,10 +73,11 @@ var Video = (function() {
return;
}
navigator.mediaDevices.getUserMedia(cnts)
- .then(function(stream) {
+ .then(stream => {
if (state.disposed || msg.instanceUid !== v.data('instance-uid')) {
return;
}
+ state.localStream = stream;
let _stream = stream;
const data = {};
if (stream.getAudioTracks().length !== 0) {
@@ -93,7 +94,6 @@ var Video = (function() {
} else {
data.aDest = data.aCtx.createMediaStreamDestination();
data.analyser.connect(data.aDest);
- data.aSrc.origStream = stream;
_stream = data.aDest.stream;
stream.getVideoTracks().forEach(function(track) {
_stream.addTrack(track);
@@ -482,7 +482,6 @@ var Video = (function() {
}
if (data.aSrc) {
VideoUtil.cleanStream(data.aSrc.mediaStream);
- VideoUtil.cleanStream(data.aSrc.origStream);
VideoUtil.disconnect(data.aSrc);
data.aSrc = null;
}
@@ -519,8 +518,10 @@ var Video = (function() {
state.options = null;
}
_cleanData(state.data);
+ VideoUtil.cleanStream(state.localStream);
VideoUtil.cleanStream(state.stream);
state.data = null;
+ state.localStream = null;
state.stream = null;
const video = state.video;
if (video && video.length > 0) {