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 2018/07/15 09:35:46 UTC
[openmeetings] 07/07: [OPENMEETINGS-1142] client merge is improved,
pod resize is improved
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
commit 22cf75803f52ad98f6154999c23cb1548bc3827f
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Thu Jun 28 17:34:19 2018 +0700
[OPENMEETINGS-1142] client merge is improved, pod resize is improved
---
.../main/java/org/apache/openmeetings/db/entity/basic/Client.java | 6 +++---
.../main/java/org/apache/openmeetings/web/room/wb/interview-area.js | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Client.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Client.java
index 1b95d75..3c789f5 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Client.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Client.java
@@ -442,18 +442,18 @@ public class Client implements IClient, IWsClient {
public void merge(Client c) {
user = c.user;
room = c.room;
+ Set<Right> rr = new HashSet<>(c.rights);
synchronized (rights) {
- Set<Right> rr = new HashSet<>(c.rights);
rights.clear();
rights.addAll(rr);
}
+ Set<Activity> aa = new HashSet<>(c.activities);
synchronized (activities) {
- Set<Activity> aa = new HashSet<>(c.activities);
activities.clear();
activities.addAll(aa);
}
+ Set<String> ss = new HashSet<>(c.streams);
synchronized (streams) {
- Set<String> ss = new HashSet<>(c.streams);
streams.clear();
streams.addAll(ss);
}
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/interview-area.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/interview-area.js
index b37c7a8..73bbf4d 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/interview-area.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/interview-area.js
@@ -34,7 +34,6 @@ var InterviewWbArea = function() {
}
pArea.find('.ui-sortable-placeholder.pod').hide();
_updateAreaClass();
- _resizePod();
}
});
pArea.sortable({
@@ -101,6 +100,7 @@ var InterviewWbArea = function() {
cls +='max33';
}
pArea.attr('class', cls);
+ _resizePod();
}
self.init = _init;