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 2022/05/18 14:35:58 UTC
[openmeetings] branch master updated (410a30917 -> 7fb6ca2e9)
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 410a30917 [OPENMEETINGS-2733] some Sonar issues are addressed
new f659f1b14 [OPENMEETINGS-2732] fabric.js
new 7fb6ca2e9 [OPENMEETINGS-2733] some Sonar issues are addressed
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/core/remote/KurentoHandler.java | 9 +++++----
openmeetings-web/src/main/front/wb/package.json | 2 +-
openmeetings-web/src/main/front/wb/src/wb.js | 7 -------
.../main/java/org/apache/openmeetings/web/common/MainPanel.java | 2 +-
.../main/java/org/apache/openmeetings/web/pages/BasePage.java | 2 +-
.../java/org/apache/openmeetings/web/util/OmUrlFragment.java | 1 +
6 files changed, 9 insertions(+), 14 deletions(-)
[openmeetings] 01/02: [OPENMEETINGS-2732] fabric.js
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 f659f1b14a265ebbd01d61795fa53dc00320252f
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Wed May 18 21:35:02 2022 +0700
[OPENMEETINGS-2732] fabric.js
---
openmeetings-web/src/main/front/wb/package.json | 2 +-
openmeetings-web/src/main/front/wb/src/wb.js | 7 -------
2 files changed, 1 insertion(+), 8 deletions(-)
diff --git a/openmeetings-web/src/main/front/wb/package.json b/openmeetings-web/src/main/front/wb/package.json
index b2ce35f75..e84874c63 100644
--- a/openmeetings-web/src/main/front/wb/package.json
+++ b/openmeetings-web/src/main/front/wb/package.json
@@ -18,7 +18,7 @@
"tinyify": "^3.0.0"
},
"dependencies": {
- "fabric": "^4.6.0",
+ "fabric": "^5.2.1",
"mathjax-full": "^3.2.0"
}
}
diff --git a/openmeetings-web/src/main/front/wb/src/wb.js b/openmeetings-web/src/main/front/wb/src/wb.js
index f979e328d..adbff2fe6 100644
--- a/openmeetings-web/src/main/front/wb/src/wb.js
+++ b/openmeetings-web/src/main/front/wb/src/wb.js
@@ -84,10 +84,6 @@ module.exports = class Wb {
}
function _createObject(arr, handler) {
fabric.util.enlivenObjects(arr, function(objects) {
- self.eachCanvas(function(canvas) {
- canvas.renderOnAddRemove = false;
- });
-
for (let i = 0; i < objects.length; ++i) {
const _o = objects[i];
_o.loaded = true;
@@ -95,7 +91,6 @@ module.exports = class Wb {
}
self.eachCanvas(function(canvas) {
- canvas.renderOnAddRemove = true;
canvas.requestRenderAll();
});
});
@@ -473,14 +468,12 @@ module.exports = class Wb {
this.clearSlide = (_sl) => {
if (canvases.length > _sl) {
const canvas = canvases[_sl];
- canvas.renderOnAddRemove = false;
let arr = canvas.getObjects();
while (arr.length > 0) {
canvas.remove(arr[arr.length - 1]);
arr = canvas.getObjects();
}
$('.room-block .wb-block .wb-video.slide-' + _sl).remove();
- canvas.renderOnAddRemove = true;
canvas.requestRenderAll();
}
};
[openmeetings] 02/02: [OPENMEETINGS-2733] some Sonar issues are addressed
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 7fb6ca2e9ea0379781d12f84b312771234bfd83e
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Wed May 18 21:35:45 2022 +0700
[OPENMEETINGS-2733] some Sonar issues are addressed
---
.../java/org/apache/openmeetings/core/remote/KurentoHandler.java | 9 +++++----
.../main/java/org/apache/openmeetings/web/common/MainPanel.java | 2 +-
.../main/java/org/apache/openmeetings/web/pages/BasePage.java | 2 +-
.../java/org/apache/openmeetings/web/util/OmUrlFragment.java | 1 +
4 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KurentoHandler.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KurentoHandler.java
index ab8b144b5..3c3d1300e 100644
--- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KurentoHandler.java
+++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KurentoHandler.java
@@ -509,13 +509,14 @@ public class KurentoHandler {
@Override
public void onEvent(ObjectCreatedEvent evt) {
- log.debug("Kurento::ObjectCreated -> {}, source {}", evt.getObject(), evt.getSource());
- if (evt.getObject() instanceof MediaPipeline) {
+ MediaObject obj = evt.getObject();
+ log.debug("Kurento::ObjectCreated -> {}, source {}", obj, evt.getSource());
+ if (obj instanceof MediaPipeline) {
// room created
- final String roid = evt.getObject().getId();
+ final String roid = obj.getId();
checkPipeline(roid);
- } else if (evt.getObject() instanceof Endpoint curPoint) {
+ } else if (obj instanceof Endpoint curPoint) {
// endpoint created
final String eoid = curPoint.getId();
final Class<? extends Endpoint> clazz = getEndpointClass(curPoint);
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
index ca2132bd2..bf83b3ed2 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
@@ -423,7 +423,7 @@ public class MainPanel extends Panel {
}
if (updateFragment) {
UrlFragment uf = new UrlFragment(handler);
- uf.set(f.getArea().name(), f.getType());
+ uf.set(f.getArea().area(), f.getType());
}
}
}
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java
index 92350d31e..0438b7067 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java
@@ -104,7 +104,7 @@ public abstract class BasePage extends AsyncUrlFragmentAwarePage {
protected OmUrlFragment getUrlFragment(IRequestParameters params) {
for (AreaKeys key : AreaKeys.values()) {
- StringValue type = params.getParameterValue(key.name());
+ StringValue type = params.getParameterValue(key.area());
if (!type.isEmpty()) {
return new OmUrlFragment(key, type.toString());
}
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/OmUrlFragment.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/OmUrlFragment.java
index 4d89c4841..f7bcf4946 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/OmUrlFragment.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/OmUrlFragment.java
@@ -97,6 +97,7 @@ public class OmUrlFragment implements Serializable {
public String area() {
return name().toLowerCase(Locale.ROOT);
}
+
public static AreaKeys of(String val) {
return val == null ? null : AreaKeys.valueOf(val.toUpperCase(Locale.ROOT));
}