Repository: openmeetings Updated Branches: refs/heads/master a3379255d -> 943f172e9
[OPENMEETINGS-551] delete WB object is fixed, upload with clean is fixed Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/4794f6f0 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/4794f6f0 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/4794f6f0 Branch: refs/heads/master Commit: 4794f6f07d20b3b1de44a67ee12a8ad93b6de480 Parents: a337925 Author: Maxim Solodovnik <[email protected]> Authored: Fri Apr 28 17:03:42 2017 +0000 Committer: Maxim Solodovnik <[email protected]> Committed: Fri Apr 28 17:03:42 2017 +0000 ---------------------------------------------------------------------- .../src/main/java/org/apache/openmeetings/web/room/room.js | 1 + .../main/java/org/apache/openmeetings/web/room/wb/WbPanel.java | 5 +++-- .../src/main/java/org/apache/openmeetings/web/room/wb/wb.js | 6 +++--- 3 files changed, 7 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/4794f6f0/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js index 6581ef3..866d033 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js @@ -88,6 +88,7 @@ var Video = (function() { handle.text(ui.value); } }); + //TODO add mute, ADD refresh } vc = v.find('.video'); vc.width(_w).height(_h); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/4794f6f0/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java ---------------------------------------------------------------------- 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 47e6fd4..9c9cd62 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 @@ -189,7 +189,8 @@ public class WbPanel extends Panel { Whiteboard wb = getBean(WhiteboardCache.class).get(roomId).get(obj.getLong("wbId")); JSONArray arr = obj.getJSONArray("obj"); for (int i = 0; i < arr.length(); ++i) { - wb.remove(arr.getString(i)); + JSONObject _o = arr.getJSONObject(i); + wb.remove(_o.getString("uid")); } sendWbAll(Action.deleteObj, obj); } @@ -442,11 +443,11 @@ public class WbPanel extends Panel { .put("uid", wuid) .put("slide", wb.getSlide()) ; - wb.put(wuid, file); final String ruid = wbs.getUid(); if (clean) { clearAll(wb); } + wb.put(wuid, file); WebSocketHelper.sendRoom( roomId , new JSONObject().put("type", "wb") http://git-wip-us.apache.org/repos/asf/openmeetings/blob/4794f6f0/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb.js ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb.js index 61f1c0c..400bf1d 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb.js @@ -1065,8 +1065,8 @@ var WbArea = (function() { }); }); } else { - var obj = canvas.getActiveObject(); - if (!!obj) { + var o = canvas.getActiveObject(); + if (!!o) { arr.push({ uid: o.uid , slide: o.slide @@ -1198,8 +1198,8 @@ var WbArea = (function() { _addCloseBtn(li); var wbo = Wb(); - wb.data(wbo); wbo.init(obj.wbId, tid, readOnly); + wb.data(wbo); _resizeWbs(); } self.createWb = function(obj) {
