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 c6a9bcf [OPENMEETINGS-1856] sonar should be more happy
c6a9bcf is described below
commit c6a9bcfe21f2151533127b4acbbc9b82123d3f5d
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Fri Nov 9 15:02:53 2018 +0700
[OPENMEETINGS-1856] sonar should be more happy
---
.../apache/openmeetings/web/room/raw-nettest.js | 25 ++--
.../org/apache/openmeetings/web/room/raw-room.js | 4 +-
.../apache/openmeetings/web/room/raw-settings.js | 147 ++++++++++-----------
.../openmeetings/web/room/raw-video-manager.js | 85 ++++++------
.../org/apache/openmeetings/web/room/raw-video.js | 102 +++++++-------
.../openmeetings/web/room/wb/raw-interview-area.js | 24 +---
.../apache/openmeetings/web/room/wb/raw-wb-area.js | 2 +
.../openmeetings/web/room/wb/raw-wb-board.js | 6 +
8 files changed, 197 insertions(+), 198 deletions(-)
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-nettest.js
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-nettest.js
index 2d65a47..52e2a24 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-nettest.js
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-nettest.js
@@ -43,6 +43,20 @@ var NetTest = (function() {
});
net = new Network();
+ _initTests()
+ // progress can be added
+ net.upload
+ .on('start', _start)
+ .on('restart', _restart)
+ .on('end', _end);
+ net.download
+ .on('start', _start)
+ .on('restart', _restart)
+ .on('end', _end);
+ net.latency.on('start', _start);
+ $('.nettest button[data-start="true"]').click()
+ }
+ function _initTests() {
tests = {
ping: {
start: function() {
@@ -99,17 +113,6 @@ var NetTest = (function() {
}
}
};
- // progress can be added
- net.upload
- .on('start', _start)
- .on('restart', _restart)
- .on('end', _end);
- net.download
- .on('start', _start)
- .on('restart', _restart)
- .on('end', _end);
- net.latency.on('start', _start);
- $('.nettest button[data-start="true"]').click()
}
function __start(size, newSection) {
const msg = $('<span></span>').append(lbls['report.start']);
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-room.js
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-room.js
index 286ef12..733cc93 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-room.js
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-room.js
@@ -77,6 +77,8 @@ var Room = (function() {
}
}
break;
+ default:
+ // no-op
}
}
if (e.which === 27) {
@@ -230,7 +232,7 @@ var Room = (function() {
wbArea.append(qv);
}
const pro = qv.find('.control.pro')
- con = qv.find('.control.con');
+ , con = qv.find('.control.con');
if (obj.voted) {
pro.removeClass('clickable').off();
con.removeClass('clickable').off();
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 a831ea0..f08d860 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
@@ -310,10 +310,6 @@ var VideoSettings = (function() {
recAllowed = allow;
_updateRec();
}
- function _allowPlay() {
- _updateRec();
- playBtn.prop('disabled', false).button('refresh');
- }
function _micActivity(level) {
lm.getKendoProgressBar().value(140 * level); // magic number
}
@@ -434,6 +430,78 @@ var VideoSettings = (function() {
_updateRec();
_setEnabled(false);
}
+ function _onKMessage(m) {
+ OmUtil.info('Received message: ', m);
+ switch (m.id) {
+ case 'canRecord':
+ _readValues(m, function(_offerSdp, cnts) {
+ OmUtil.info('Invoking SDP offer
callback function');
+ OmUtil.sendMessage({
+ id : 'record'
+ , sdpOffer: _offerSdp
+ , video: cnts.video !== false
+ , audio: cnts.audio !== false
+ }, MsgBase);
+ rtcPeer.on('icecandidate',
_onIceCandidate);
+ });
+ break;
+ case 'canPlay':
+ {
+ const options =
VideoUtil.addIceServers({
+ remoteVideo: vid[0]
+ , mediaConstraints: {audio:
true, video: true}
+ , onicecandidate:
_onIceCandidate
+ }, m);
+ _clear();
+ rtcPeer = new
kurentoUtils.WebRtcPeer.WebRtcPeerRecvonly(
+ options
+ , function(error) {
+ if (error) {
+ return
OmUtil.error(error);
+ }
+
rtcPeer.generateOffer(function(error, offerSdp) {
+ if (error) {
+ return
OmUtil.error('Error generating the offer');
+ }
+
OmUtil.sendMessage({
+ id :
'play'
+ ,
sdpOffer: offerSdp
+ }, MsgBase);
+ });
+ });
+ }
+ break;
+ case 'playResponse':
+ case 'startResponse':
+ OmUtil.log('SDP answer received from server.
Processing ...');
+ rtcPeer.processAnswer(m.sdpAnswer,
function(error) {
+ if (error) {
+ return OmUtil.error(error);
+ }
+ });
+ break;
+ case 'iceCandidate':
+ rtcPeer.addIceCandidate(m.candidate,
function(error) {
+ if (error) {
+ return OmUtil.error('Error
adding candidate: ' + error);
+ }
+ });
+ break;
+ case 'recording':
+ timer.show().find('.time').text(m.time);
+ break;
+ case 'recStopped':
+ timer.hide();
+ _onStop()
+ break;
+ case 'playStopped':
+ _onStop();
+ _readValues();
+ break;
+ default:
+ // no-op
+ }
+ }
function _onWsMessage(jqEvent, msg) {
try {
if (msg instanceof Blob) {
@@ -442,76 +510,7 @@ var VideoSettings = (function() {
const m = jQuery.parseJSON(msg);
if (m && 'kurento' === m.type) {
if ('test' === m.mode) {
- OmUtil.info('Received message: ', m);
- switch (m.id) {
- case 'canRecord':
- _readValues(m,
function(_offerSdp, cnts) {
-
OmUtil.info('Invoking SDP offer callback function');
-
OmUtil.sendMessage({
- id :
'record'
- ,
sdpOffer: _offerSdp
- ,
video: cnts.video !== false
- ,
audio: cnts.audio !== false
- }, MsgBase);
-
rtcPeer.on('icecandidate', _onIceCandidate);
- });
- break;
- case 'canPlay':
- {
- const options =
VideoUtil.addIceServers({
-
remoteVideo: vid[0]
- ,
mediaConstraints: {audio: true, video: true}
- ,
onicecandidate: _onIceCandidate
- }, m);
- _clear();
- rtcPeer = new
kurentoUtils.WebRtcPeer.WebRtcPeerRecvonly(
- options
- ,
function(error) {
-
if (error) {
-
return OmUtil.error(error);
-
}
-
rtcPeer.generateOffer(function(error, offerSdp) {
-
if (error) {
-
return OmUtil.error('Error generating the offer');
-
}
-
OmUtil.sendMessage({
-
id : 'play'
-
, sdpOffer: offerSdp
-
}, MsgBase);
-
});
- });
- }
- break;
- case 'playResponse':
- case 'startResponse':
- OmUtil.log('SDP answer
received from server. Processing ...');
-
rtcPeer.processAnswer(m.sdpAnswer, function(error) {
- if (error) {
- return
OmUtil.error(error);
- }
- });
- break;
- case 'iceCandidate':
-
rtcPeer.addIceCandidate(m.candidate, function(error) {
- if (error) {
- return
OmUtil.error('Error adding candidate: ' + error);
- }
- });
- break;
- case 'recording':
-
timer.show().find('.time').text(m.time);
- break;
- case 'recStopped':
- timer.hide();
- _onStop()
- break;
- case 'playStopped':
- _onStop();
- _readValues();
- break;
- default:
- // no-op
- }
+ _onKMessage(m);
}
switch (m.id) {
case 'error':
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 6e8a872..d58a32a 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
@@ -26,6 +26,49 @@ var VideoManager = (function() {
Video().init(msg);
OmUtil.log(uid + ' receiving video');
}
+ function _onKMessage(m) {
+ OmUtil.info('Received message: ' + msg);
+ switch (m.id) {
+ case 'clientLeave':
+ $(VID_SEL + ' div[data-client-uid="' + m.uid +
'"]').each(function() {
+ _closeV($(this));
+ });
+ if (share.data('cuid') === m.uid) {
+ share.off('click').hide();
+ }
+ break;
+ case 'broadcastStopped':
+ _close(m.uid, false);
+ break;
+ case 'broadcast':
+ _onBroadcast(m);
+ break;
+ case 'videoResponse':
+ _onVideoResponse(m);
+ break;
+ case 'iceCandidate':
+ {
+ const w = $('#' +
VideoUtil.getVid(m.uid))
+ , v = w.data()
+
+
v.getPeer().addIceCandidate(m.candidate, function (error) {
+ if (error) {
+ OmUtil.error('Error
adding candidate: ' + error);
+ return;
+ }
+ });
+ }
+ break;
+ case 'newStream':
+ _play([m.stream], m.iceServers);
+ break;
+ case 'error':
+ OmUtil.error(m.message);
+ break;
+ default:
+ //no-op
+ }
+ }
function _onWsMessage(jqEvent, msg) {
try {
if (msg instanceof Blob) {
@@ -36,47 +79,7 @@ var VideoManager = (function() {
return;
}
if ('kurento' === m.type && 'test' !== m.mode) {
- OmUtil.info('Received message: ' + msg);
- switch (m.id) {
- case 'clientLeave':
- $(VID_SEL + '
div[data-client-uid="' + m.uid + '"]').each(function() {
- _closeV($(this));
- });
- if (share.data('cuid') ===
m.uid) {
-
share.off('click').hide();
- }
- break;
- case 'broadcastStopped':
- _close(m.uid, false);
- break;
- case 'broadcast':
- _onBroadcast(m);
- break;
- case 'videoResponse':
- _onVideoResponse(m);
- break;
- case 'iceCandidate':
- {
- const w = $('#' +
VideoUtil.getVid(m.uid))
- , v = w.data()
-
-
v.getPeer().addIceCandidate(m.candidate, function (error) {
- if (error) {
-
OmUtil.error('Error adding candidate: ' + error);
- return;
- }
- });
- }
- break;
- case 'newStream':
- _play([m.stream], m.iceServers);
- break;
- case 'error':
- OmUtil.error(m.message);
- break;
- default:
- //no-op
- }
+ _onKMessage(m);
} else if ('mic' === m.type) {
switch (m.id) {
case 'activity':
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 4fb34cc..9cec139 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
@@ -11,11 +11,6 @@ var Video = (function() {
function _getExtra() {
return t.height() + 2 + (f.is(':visible') ? f.height() : 0);
}
- function _resizeDlg(_w, _h) {
- const h = _h + _getExtra();
- _resizeDlgArea(_w, h);
- return h;
- }
function _resizeDlgArea(_w, _h) {
v.dialog('option', 'width', _w).dialog('option', 'height', _h);
const h = _h - _getExtra();
@@ -295,6 +290,55 @@ var Video = (function() {
});
}
}
+ function _initCamDialog() {
+ v.parent().find('.ui-dialog-titlebar-buttonpane')
+ .append($('#video-volume-btn').children().clone())
+ .append($('#video-refresh-btn').children().clone());
+ const volume = v.parent().find('.dropdown-menu.video.volume');
+ slider = v.parent().find('.slider');
+ vol = v.parent().find('.ui-dialog-titlebar-volume')
+ .on('mouseenter', function(e) {
+ e.stopImmediatePropagation();
+ volume.toggle();
+ })
+ .click(function(e) {
+ e.stopImmediatePropagation();
+ roomAction('mute', JSON.stringify({uid: sd.uid,
mute: !muted}));
+ _mute(!muted);
+ volume.hide();
+ return false;
+ }).dblclick(function(e) {
+ e.stopImmediatePropagation();
+ return false;
+ });
+ v.parent().find('.ui-dialog-titlebar-refresh')
+ .click(function(e) {
+ e.stopImmediatePropagation();
+ _refresh();
+ return false;
+ }).dblclick(function(e) {
+ e.stopImmediatePropagation();
+ return false;
+ });
+ volume.on('mouseleave', function() {
+ $(this).hide();
+ });
+ handle = v.parent().find('.slider .handle');
+ slider.slider({
+ orientation: 'vertical'
+ , range: 'min'
+ , min: 0
+ , max: 100
+ , value: lastVolume
+ , create: function() {
+ handle.text($(this).slider('value'));
+ }
+ , slide: function(event, ui) {
+ _handleVolume(ui.value);
+ }
+ });
+ vol.hide();
+ }
function _init(msg) {
sd = msg.stream;
sd.activities = sd.activities.sort();
@@ -332,53 +376,7 @@ var Video = (function() {
_initDialog(v, opts);
}
if (!isSharing && !isRecording) {
- v.parent().find('.ui-dialog-titlebar-buttonpane')
-
.append($('#video-volume-btn').children().clone())
-
.append($('#video-refresh-btn').children().clone());
- const volume =
v.parent().find('.dropdown-menu.video.volume');
- slider = v.parent().find('.slider');
- vol = v.parent().find('.ui-dialog-titlebar-volume')
- .on('mouseenter', function(e) {
- e.stopImmediatePropagation();
- volume.toggle();
- })
- .click(function(e) {
- e.stopImmediatePropagation();
- roomAction('mute', JSON.stringify({uid:
sd.uid, mute: !muted}));
- _mute(!muted);
- volume.hide();
- return false;
- }).dblclick(function(e) {
- e.stopImmediatePropagation();
- return false;
- });
- v.parent().find('.ui-dialog-titlebar-refresh')
- .click(function(e) {
- e.stopImmediatePropagation();
- _refresh();
- return false;
- }).dblclick(function(e) {
- e.stopImmediatePropagation();
- return false;
- });
- volume.on('mouseleave', function() {
- $(this).hide();
- });
- handle = v.parent().find('.slider .handle');
- slider.slider({
- orientation: 'vertical'
- , range: 'min'
- , min: 0
- , max: 100
- , value: lastVolume
- , create: function() {
- handle.text($(this).slider('value'));
- }
- , slide: function(event, ui) {
- _handleVolume(ui.value);
- }
- });
- vol.hide();
+ _initCamDialog();
}
v.on("remove", _cleanup);
vc = v.find('.video');
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-interview-area.js
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-interview-area.js
index 85d22e4..ca612d3 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-interview-area.js
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-interview-area.js
@@ -1,7 +1,7 @@
/* Licensed under the Apache License, Version 2.0 (the "License")
http://www.apache.org/licenses/LICENSE-2.0 */
var InterviewWbArea = function() {
const self = BaseWbArea();;
- let container, area, pArea, role = NONE, choose, _inited = false, rec;
+ let container, area, pArea, role = NONE, _inited = false, rec;
function _init() {
Wicket.Event.subscribe("/websocket/message", self.wbWsHandler);
@@ -94,24 +94,10 @@ var InterviewWbArea = function() {
} else {
empt.remove();
}
- let cls = 'pod-area ';
- if (count < 2) {
- cls +='max2';
- } else if (count < 3) {
- cls +='max3';
- } else if (count < 5) {
- cls +='max5';
- } else if (count < 9) {
- cls +='max9';
- } else if (count < 13) {
- cls +='max13';
- } else if (count < 17) {
- cls +='max17';
- } else if (count < 25) {
- cls +='max25';
- } else if (count < 33) {
- cls +='max33';
- }
+ const cls = 'pod-area max' +
+ [2, 3, 5, 9, 13, 17, 25, 33].find((el) => {
+ return count < el;
+ });
pArea.attr('class', cls);
_resizePod();
}
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-area.js
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-area.js
index c7d2467..677fb91 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-area.js
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-area.js
@@ -89,6 +89,8 @@ var DrawWbArea = function() {
e.preventDefault();
e.stopImmediatePropagation();
return _performDelete();
+ default:
+ //no-op
}
}
}
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-board.js
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-board.js
index 5997a29..7820263 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-board.js
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-board.js
@@ -370,6 +370,8 @@ var Wb = function() {
case 'custom':
zoom = 1. *
$(this).data('custom-val');
break;
+ default:
+ //no-op
}
} else {
zoom = 1. * zzz;
@@ -383,6 +385,8 @@ var Wb = function() {
});
_setSize();
_initToolBtn('apointer', _firstToolItem,
APointer(wb, s));
+ default:
+ //no-op
}
}
function _findObject(o) {
@@ -490,6 +494,8 @@ var Wb = function() {
r.type = 'math';
delete r.objects;
break;
+ default:
+ //no-op
}
return r;
}
