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/10/10 06:24:17 UTC
openmeetings git commit: [OPENMEETINGS-1714] some issues are fixed
Repository: openmeetings
Updated Branches:
refs/heads/master d1466705d -> 05ea01fc2
[OPENMEETINGS-1714] some issues are fixed
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/05ea01fc
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/05ea01fc
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/05ea01fc
Branch: refs/heads/master
Commit: 05ea01fc28ef85c9de7b362251f6f9ff1bf598cc
Parents: d146670
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Tue Oct 10 13:24:10 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Tue Oct 10 13:24:10 2017 +0700
----------------------------------------------------------------------
.../apache/openmeetings/web/room/wb/WbWebSocketHelper.java | 9 ++++-----
.../java/org/apache/openmeetings/web/room/wb/wb-area.js | 4 ++--
2 files changed, 6 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/05ea01fc/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbWebSocketHelper.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbWebSocketHelper.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbWebSocketHelper.java
index 2825f52..7102f38 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbWebSocketHelper.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbWebSocketHelper.java
@@ -131,10 +131,8 @@ public class WbWebSocketHelper extends WebSocketHelper {
roomId
, new JSONObject().put("type", "wb")
, null
- , (o, c) -> o.put("func", String.format("WbArea.%s(%s);"
- , WbAction.createObj.name()
- , getObjWbJson(wbId, addFileUrl(ruid, file, fi, c)).toString())
- ).toString());
+ , (o, c) -> o.put("func", WbAction.createObj.name())
+ .put("param", getObjWbJson(wbId, addFileUrl(ruid, file, fi, c)).toString()).toString());
}
private static void sendWb(Long roomId, WbAction meth, JSONObject obj, Predicate<Client> check) {
@@ -142,7 +140,8 @@ public class WbWebSocketHelper extends WebSocketHelper {
roomId
, new JSONObject().put("type", "wb")
, check
- , (o, c) -> o.put("func", String.format("WbArea.%s(%s);", meth.name(), obj.toString(new NullStringer()))).toString()
+ , (o, c) -> o.put("func", meth.name())
+ .put("param", obj.toString(new NullStringer())).toString()
);
}
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/05ea01fc/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-area.js
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-area.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-area.js
index 960bff9..8807fd9 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-area.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-area.js
@@ -285,8 +285,8 @@ $(function() {
return; //ping
}
const m = jQuery.parseJSON(msg);
- if (m && 'wb' === m.type && typeof WbArea !== 'undefined') {
- eval(m.func);
+ if (m && 'wb' === m.type && typeof WbArea !== 'undefined' && !!m.func) {
+ WbArea[m.func](m.param);
}
} catch (err) {
//no-op