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 3c812c4 [OPENMEETINGS-1856] some sonar issues are addressed
3c812c4 is described below
commit 3c812c41a12edec00358a0aaac11f16bb9d792ba
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Wed Mar 13 23:17:13 2019 +0700
[OPENMEETINGS-1856] some sonar issues are addressed
---
.../apache/openmeetings/web/room/raw-settings.js | 12 ++++++-----
.../web/user/profile/UserProfilePanel.java | 24 +++++++++++-----------
2 files changed, 19 insertions(+), 17 deletions(-)
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 ee4bf16..835c9c3 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
@@ -136,7 +136,6 @@ var VideoSettings = (function() {
level.dispose();
level = null;
}
- _micActivity(0);
}
function _close() {
_clear();
@@ -332,8 +331,13 @@ var VideoSettings = (function() {
if (error) {
return
OmUtil.error(error);
}
- level = MicLevel();
- level.meterPeer(rtcPeer, lm,
_micActivity, OmUtil.error);
+ if (cnts.audio) {
+ lm.show();
+ level = MicLevel();
+
level.meterPeer(rtcPeer, lm, function(){}, OmUtil.error);
+ } else {
+ lm.hide();
+ }
rtcPeer.generateOffer(function(error, _offerSdp) {
if (error) {
return
OmUtil.error('Error generating the offer');
@@ -356,8 +360,6 @@ var VideoSettings = (function() {
recAllowed = allow;
_updateRec();
}
- function _micActivity(level) {
- }
function _setLoading(el) {
el.find('option').remove();
el.append(OmUtil.tmpl('#settings-option-loading'));
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java
index 95cd5ae..843c1b4 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java
@@ -37,7 +37,7 @@ public class UserProfilePanel extends UserBasePanel {
private static final long serialVersionUID = 1L;
private final WebMarkupContainer address = new
WebMarkupContainer("address");
private final Label addressDenied = new Label("addressDenied", "");
- private final WebMarkupContainer panel = new
WebMarkupContainer("info-panel");
+ private final WebMarkupContainer infoPanel = new
WebMarkupContainer("info-panel");
@SpringBean
private UserDao userDao;
@SpringBean
@@ -56,13 +56,13 @@ public class UserProfilePanel extends UserBasePanel {
protected void onInitialize() {
User u = (User)getDefaultModelObject();
- panel.add(new ProfileImagePanel("img", u.getId()));
- panel.add(new Label("firstname"));
- panel.add(new Label("lastname"));
- panel.add(new Label("timeZoneId"));
- panel.add(new Label("regdate"));
- panel.add(new TextArea<String>("userOffers").setEnabled(false));
- panel.add(new
TextArea<String>("userSearchs").setEnabled(false));
+ infoPanel.add(new ProfileImagePanel("img", u.getId()));
+ infoPanel.add(new Label("firstname"));
+ infoPanel.add(new Label("lastname"));
+ infoPanel.add(new Label("timeZoneId"));
+ infoPanel.add(new Label("regdate"));
+ infoPanel.add(new
TextArea<String>("userOffers").setEnabled(false));
+ infoPanel.add(new
TextArea<String>("userSearchs").setEnabled(false));
if (getUserId().equals(u.getId()) || u.isShowContactData()
|| (u.isShowContactDataToContacts() &&
contactDao.isContact(u.getId(), getUserId())))
{
@@ -78,15 +78,15 @@ public class UserProfilePanel extends UserBasePanel {
address.setVisible(false);
addressDenied.setDefaultModelObject(getString(u.isShowContactDataToContacts() ?
"1269" : "1268"));
}
- panel.add(address.setDefaultModel(getDefaultModel()));
- panel.add(addressDenied);
+ infoPanel.add(address.setDefaultModel(getDefaultModel()));
+ infoPanel.add(addressDenied);
- add(panel.setOutputMarkupId(true));
+ add(infoPanel.setOutputMarkupId(true));
super.onInitialize();
}
void update(AjaxRequestTarget target) {
setDefaultModelObject(userDao.get(getUserId()));
- target.add(panel);
+ target.add(infoPanel);
}
}
