[openmeetings] branch master updated: [OPENMEETINGS-2048] more stable WB load

[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


The following commit(s) were added to refs/heads/master by this push:
     new 8942411  [OPENMEETINGS-2048] more stable WB load
8942411 is described below

commit 89424118d3b79b9c8499d04d7e1ad08832710aaa
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Fri Dec 6 12:28:23 2019 +0700

    [OPENMEETINGS-2048] more stable WB load
---
 .../org/apache/openmeetings/web/room/wb/AbstractWbPanel.java |  3 ++-
 .../java/org/apache/openmeetings/web/room/wb/raw-wb-area.js  | 12 ++++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/AbstractWbPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/AbstractWbPanel.java
index cb57798..fb351da 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/AbstractWbPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/AbstractWbPanel.java
@@ -40,9 +40,10 @@ public abstract class AbstractWbPanel extends Panel {
 	}
 
 	public CharSequence getInitScript() {
-		StringBuilder sb = new StringBuilder("WbArea.init();");
+		StringBuilder sb = new StringBuilder("WbArea.init(() => {");
 		internalWbLoad(sb);
 		inited = true;
+		sb.append("});");
 		return sb;
 	}
 
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-area.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-area.js
index 7cb1807..a7a5349 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-area.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-area.js
@@ -205,11 +205,11 @@ var DrawWbArea = function() {
 	function _actionActivateWb(_wbId) {
 		OmUtil.wbAction({action: 'activateWb', data: {wbId: _wbId}});
 	}
-	self.init = function() {
-		Wicket.Event.subscribe('/websocket/message', self.wbWsHandler);
+	function _doInit(callback) {
 		container = $('.room-block .wb-block');
 		tabs = container.find('.tabs');
 		if (tabs.length === 0) {
+			setTimeout(_doInit, 100, callback);
 			return;
 		}
 		tabs.tabs({
@@ -237,9 +237,17 @@ var DrawWbArea = function() {
 		});
 		_inited = true;
 		self.setRole(role);
+		if (typeof(callback) === 'function') {
+			callback();
+		}
 		$('#wb-rename-menu').menu().find('.wb-rename').click(function() {
 			_getWbTab($(this).parent().data('wb-id')).find('a span').trigger('dblclick');
 		});
+	}
+
+	self.init = function(callback) {
+		Wicket.Event.subscribe('/websocket/message', self.wbWsHandler);
+		_doInit(callback);
 	};
 	self.destroy = function() {
 		self.removeDeleteHandler();