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 2019/11/21 07:37:38 UTC
[openmeetings] branch master updated (5e1525a -> 5aa46d0)
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git.
from 5e1525a [OPENMEETINGS-2137] tests are fixed
new 32c0aea [OPENMEETINGS-2137] SerializableConsumer is used
new 5aa46d0 [OPENMEETINGS-2135] sharing is fixed
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../java/org/apache/openmeetings/web/room/raw-video-manager.js | 8 +++++---
.../main/java/org/apache/openmeetings/web/room/wb/WbPanel.java | 3 ++-
2 files changed, 7 insertions(+), 4 deletions(-)
[openmeetings] 02/02: [OPENMEETINGS-2135] sharing is fixed
Posted by so...@apache.org.
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 5aa46d0ce0ceddace0b369b69e3335af94db6c40
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Thu Nov 21 14:37:22 2019 +0700
[OPENMEETINGS-2135] sharing is fixed
---
.../java/org/apache/openmeetings/web/room/raw-video-manager.js | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
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 f416582..8b64046 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
@@ -27,9 +27,11 @@ var VideoManager = (function() {
function _onBroadcast(msg) {
const sd = msg.stream
, uid = sd.uid;
- msg.cleanup.forEach(function(_cuid) {
- _close(_cuid);
- });
+ if (Array.isArray(msg.cleanup)) {
+ msg.cleanup.forEach(function(_cuid) {
+ _close(_cuid);
+ });
+ }
$('#' + VideoUtil.getVid(uid)).remove();
Video().init(msg);
OmUtil.log(uid + ' registered in room');
[openmeetings] 01/02: [OPENMEETINGS-2137] SerializableConsumer is
used
Posted by so...@apache.org.
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 32c0aea8e87971030bce6d7466a03874d0fcb7f2
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Thu Nov 21 14:36:53 2019 +0700
[OPENMEETINGS-2137] SerializableConsumer is used
---
.../src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java
index fef2163..87dfa31 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java
@@ -86,6 +86,7 @@ import org.apache.wicket.request.resource.JavaScriptResourceReference;
import org.apache.wicket.request.resource.ResourceReference;
import org.apache.wicket.spring.injection.annot.SpringBean;
import org.apache.wicket.util.string.Strings;
+import org.danekja.java.util.function.serializable.SerializableConsumer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -134,7 +135,7 @@ public class WbPanel extends AbstractWbPanel {
return getString("144");
}
};
- private final Consumer<Whiteboard> addUndo = wb -> {
+ private final SerializableConsumer<Whiteboard> addUndo = wb -> {
JSONArray arr = getArray(wb.toJson(), null);
if (arr.length() != 0) {
addUndo(wb.getId(), new UndoObject(UndoObject.Type.remove, arr));