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/04/28 17:03:42 UTC

svn commit: r1793118 - in /openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room: room.js wb/WbPanel.java wb/wb.js

Author: solomax
Date: Fri Apr 28 17:03:42 2017
New Revision: 1793118

URL: http://svn.apache.org/viewvc?rev=1793118&view=rev
Log:
[OPENMEETINGS-551] delete WB object is fixed, upload with clean is fixed

Modified:
    openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js
    openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java
    openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb.js

Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js?rev=1793118&r1=1793117&r2=1793118&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js Fri Apr 28 17:03:42 2017
@@ -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);

Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java?rev=1793118&r1=1793117&r2=1793118&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java Fri Apr 28 17:03:42 2017
@@ -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")

Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb.js
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb.js?rev=1793118&r1=1793117&r2=1793118&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb.js (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb.js Fri Apr 28 17:03:42 2017
@@ -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) {