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 106d7c9 [OPENMEETINGS-2412] video setup mini app should work better 106d7c9 is described below commit 106d7c9d243c877742246c2a974da6f1b9d412d2 Author: Maxim Solodovnik <solomax...@gmail.com> AuthorDate: Mon Jul 27 22:29:28 2020 +0700 [OPENMEETINGS-2412] video setup mini app should work better --- .../apache/openmeetings/web/pages/HashPage.java | 24 ++++++++++------------ 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java index f3c42ad..07c9d7d 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java @@ -49,7 +49,7 @@ import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.panel.EmptyPanel; import org.apache.wicket.model.ResourceModel; -import org.apache.wicket.protocol.http.request.WebClientInfo; +import org.apache.wicket.protocol.ws.api.WebSocketRequestHandler; import org.apache.wicket.protocol.ws.api.message.ConnectedMessage; import org.apache.wicket.request.IRequestParameters; import org.apache.wicket.request.mapper.parameter.PageParameters; @@ -180,22 +180,20 @@ public class HashPage extends BaseInitedPage implements IUpdatable { } @Override - protected IWsClient getWsClient() { - return c; - } - }) - .add(new OmAjaxClientInfoBehavior() { - private static final long serialVersionUID = 1L; - - @Override - protected void onClientInfo(AjaxRequestTarget target, WebClientInfo info) { - super.onClientInfo(target, info); - target.appendJavaScript( + protected void onConnect(WebSocketRequestHandler handler) { + super.onConnect(handler); + handler.appendJavaScript( String.format("VideoSettings.init(%s);VideoSettings.open();" , VideoSettings.getInitJson("noclient") .put("infoMsg", getString("close.settings.tab")))); } - })); + + @Override + protected IWsClient getWsClient() { + return c; + } + }) + .add(new OmAjaxClientInfoBehavior())); error = false; } }