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 2017/11/20 09:19:28 UTC
openmeetings git commit: [OPENMEETINGS-1765] settings is always
visible
Repository: openmeetings
Updated Branches:
refs/heads/4.0.x 659ee5764 -> be2d146f2
[OPENMEETINGS-1765] settings is always visible
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/be2d146f
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/be2d146f
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/be2d146f
Branch: refs/heads/4.0.x
Commit: be2d146f2b88b309398cf173ea5f5420d52e53f2
Parents: 659ee57
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Mon Nov 20 16:19:18 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Mon Nov 20 16:19:18 2017 +0700
----------------------------------------------------------------------
.../openmeetings/web/room/sidebar/ClientIconsPanel.java | 3 ++-
.../org/apache/openmeetings/web/room/sidebar/RoomSidebar.java | 7 +------
.../apache/openmeetings/web/room/sidebar/SelfIconsPanel.java | 3 ++-
3 files changed, 5 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/be2d146f/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/ClientIconsPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/ClientIconsPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/ClientIconsPanel.java
index 322281c..8cb8633 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/ClientIconsPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/ClientIconsPanel.java
@@ -61,7 +61,7 @@ public class ClientIconsPanel extends Panel {
update(null);
}
- public void update(IPartialPageRequestHandler handler) {
+ public ClientIconsPanel update(IPartialPageRequestHandler handler) {
rightModer.update(handler);
rightPresenter.update(handler);
rightWb.update(handler);
@@ -70,5 +70,6 @@ public class ClientIconsPanel extends Panel {
rightAudio.update(handler);
rightVideo.update(handler);
rightExclsv.update(handler);
+ return this;
}
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/be2d146f/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
----------------------------------------------------------------------
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 dafefe4..a20ea08 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
@@ -289,12 +289,7 @@ public class RoomSidebar extends Panel {
public void update(IPartialPageRequestHandler handler) {
updateShowFiles(handler);
updateUsers();
- final boolean rightsVisible = room.getRoom().isAllowUserQuestions() || room.getClient().hasRight(Right.moderator);
- selfRights.setVisible(rightsVisible);
- if (rightsVisible) {
- selfRights.update(handler);
- }
- handler.add(selfRights, userList);
+ handler.add(selfRights.update(handler), userList);
}
public void updateFiles(IPartialPageRequestHandler handler) {
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/be2d146f/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/SelfIconsPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/SelfIconsPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/SelfIconsPanel.java
index 3c41ecc..cadcfd3 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/SelfIconsPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/SelfIconsPanel.java
@@ -50,11 +50,12 @@ public class SelfIconsPanel extends ClientIconsPanel {
}
@Override
- public void update(IPartialPageRequestHandler handler) {
+ public ClientIconsPanel update(IPartialPageRequestHandler handler) {
setVisible(true);
super.update(handler);
settings.update(handler);
cam.update(handler);
mic.update(handler);
+ return this;
}
}