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 e1190b6 [OPENMEETINGS-1836] NPE checks are added, visual artifacts
are fixed
e1190b6 is described below
commit e1190b6ca3e4005c91f6a018674cbfca6e1cba66
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Fri Mar 30 13:04:45 2018 +0700
[OPENMEETINGS-1836] NPE checks are added, visual artifacts are fixed
---
.../openmeetings/core/remote/ScopeApplicationAdapter.java | 15 ++++++++++-----
.../apache/openmeetings/web/room/sidebar/RoomSidebar.html | 14 +++++++++-----
openmeetings-web/src/main/webapp/css/room.css | 4 ++++
3 files changed, 23 insertions(+), 10 deletions(-)
diff --git
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ScopeApplicationAdapter.java
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ScopeApplicationAdapter.java
index 36985fe..80e1543 100644
---
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ScopeApplicationAdapter.java
+++
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ScopeApplicationAdapter.java
@@ -938,11 +938,16 @@ public class ScopeApplicationAdapter /*extends
MultiThreadedApplicationAdapter i
public void micActivity(boolean active) {
IConnection current = Red5.getConnectionLocal();
StreamClient client =
streamClientManager.get(IClientUtil.getId(current.getClient()));
- WebSocketHelper.sendRoom(client.getRoomId(), new JSONObject()
- .put("type", "mic")
- .put("id", "activity")
- .put("uid",
clientManager.uidBySid(client.getSid()))
- .put("active", active));
+ if (client != null && client.getRoomId() != null) {
+ final String uid =
clientManager.uidBySid(client.getSid());
+ if (uid != null) {
+ WebSocketHelper.sendRoom(client.getRoomId(),
new JSONObject()
+ .put("type", "mic")
+ .put("id", "activity")
+ .put("uid", uid)
+ .put("active", active));
+ }
+ }
}
/*
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html
index f962f48..4093440 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html
@@ -36,15 +36,19 @@
</ul>
<div id="room-sidebar-tab-users">
<div wicket:id="icons" class="user header"></div>
- <div class="user list clear" wicket:id="user-list">
- <div wicket:id="user" class="user entry
ui-corner-all ui-widget-content">
- <div wicket:id="user"></div>
+ <div class="user list clear">
+ <div wicket:id="user-list">
+ <div wicket:id="user" class="user entry
ui-corner-all ui-widget-content">
+ <div wicket:id="user"></div>
+ </div>
</div>
</div>
- <script>Room.setSize();</script>
+ <script type="text/javascript">Room.setSize();</script>
</div>
<div id="room-sidebar-tab-files" wicket:enclosure="tree">
- <div class="file list" wicket:id="tree"></div>
+ <div class="file list">
+ <div wicket:id="tree"></div>
+ </div>
</div>
</div>
<div wicket:id="activities"></div>
diff --git a/openmeetings-web/src/main/webapp/css/room.css
b/openmeetings-web/src/main/webapp/css/room.css
index b3d50e4..510d981 100644
--- a/openmeetings-web/src/main/webapp/css/room.css
+++ b/openmeetings-web/src/main/webapp/css/room.css
@@ -394,6 +394,10 @@
line-height: 30px;
width: auto;
max-width: 80px;
+}
+.room.sidebar .tab.om-icon.big .label {
+ max-width: 50px;
+ display: inline-block;
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
--
To stop receiving notification emails like this one, please contact
[email protected].
