[openmeetings] branch master updated: [OPENMEETINGS-2513] room is displayed as expected if entered via password protected invitation
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 b9b202a [OPENMEETINGS-2513] room is displayed as expected if entered
via password protected invitation
b9b202a is described below
commit b9b202a120b2720ce46b339e0fe8a7525760a9f8
Author: Maxim Solodovnik
AuthorDate: Wed Nov 18 15:49:57 2020 +0700
[OPENMEETINGS-2513] room is displayed as expected if entered via password
protected invitation
---
.../main/java/org/apache/openmeetings/web/room/RoomPanel.java | 11 ++-
.../main/java/org/apache/openmeetings/web/user/chat/Chat.java | 5 ++---
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
index e0f9780..f79c1bb 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
@@ -81,6 +81,7 @@ import
org.apache.wicket.authroles.authorization.strategies.role.annotations.Aut
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.event.IEvent;
import org.apache.wicket.extensions.ajax.AjaxDownloadBehavior;
+import org.apache.wicket.markup.head.HeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
@@ -108,6 +109,7 @@ import com.github.openjson.JSONObject;
import com.googlecode.wicket.jquery.core.JQueryBehavior;
import com.googlecode.wicket.jquery.core.Options;
import com.googlecode.wicket.jquery.ui.interaction.droppable.Droppable;
+import com.googlecode.wicket.jquery.ui.settings.JQueryUILibrarySettings;
import
de.agilecoders.wicket.core.markup.html.bootstrap.button.BootstrapAjaxLink;
import de.agilecoders.wicket.core.markup.html.bootstrap.button.Buttons;
@@ -679,7 +681,14 @@ public class RoomPanel extends BasePanel {
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
response.render(new
PriorityHeaderItem(JavaScriptHeaderItem.forReference(interview ?
INTERVIEWWB_JS_REFERENCE : WB_JS_REFERENCE)));
- response.render(new
PriorityHeaderItem(JavaScriptHeaderItem.forReference(new
JavaScriptResourceReference(RoomPanel.class, "room.js";
+ response.render(new
PriorityHeaderItem(JavaScriptHeaderItem.forReference(new
JavaScriptResourceReference(RoomPanel.class, "room.js"))) {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public List getDependencies() {
+ return List.of(new
PriorityHeaderItem(JavaScriptHeaderItem.forReference(JQueryUILibrarySettings.get().getJavaScriptReference(;
+ }
+ });
response.render(JavaScriptHeaderItem.forReference(TouchPunchResourceReference.instance()));
if (room.isVisible()) {
response.render(OnDomReadyHeaderItem.forScript(roomEnter.getCallbackScript()));
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java
index ef941e3..fdd7598 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java
@@ -60,8 +60,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.github.openjson.JSONObject;
-
-import
de.agilecoders.wicket.extensions.markup.html.bootstrap.jqueryui.JQueryUIJavaScriptReference;
+import com.googlecode.wicket.jquery.ui.settings.JQueryUILibrarySettings;
public class Chat extends Panel {
private static final long serialVersionUID = 1L;
@@ -178,7 +177,7 @@ public class Chat extends Panel {
@Override
public List getDependencies() {
return
List.of(JavaScriptHeaderItem.forScript("const bstooltip = jQuery.fn.tooltip;",
"preserve-bs-tooltip")
- ,
JQueryUIJavaScriptReference.asHeaderItem()
+ ,
JavaScriptHeaderItem.forReference(JQueryUILibrarySettings.get().getJavaScriptReference())
,
JavaScriptHeaderItem.forScript("jQuery.fn.tooltip = bstooltip;",
"restore-bs-tooltip")
);
}
[openmeetings] branch master updated: [OPENMEETINGS-2513] room is displayed as expected if entered via password protected invitation
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 b9b202a [OPENMEETINGS-2513] room is displayed as expected if entered
via password protected invitation
b9b202a is described below
commit b9b202a120b2720ce46b339e0fe8a7525760a9f8
Author: Maxim Solodovnik
AuthorDate: Wed Nov 18 15:49:57 2020 +0700
[OPENMEETINGS-2513] room is displayed as expected if entered via password
protected invitation
---
.../main/java/org/apache/openmeetings/web/room/RoomPanel.java | 11 ++-
.../main/java/org/apache/openmeetings/web/user/chat/Chat.java | 5 ++---
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
index e0f9780..f79c1bb 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
@@ -81,6 +81,7 @@ import
org.apache.wicket.authroles.authorization.strategies.role.annotations.Aut
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.event.IEvent;
import org.apache.wicket.extensions.ajax.AjaxDownloadBehavior;
+import org.apache.wicket.markup.head.HeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
@@ -108,6 +109,7 @@ import com.github.openjson.JSONObject;
import com.googlecode.wicket.jquery.core.JQueryBehavior;
import com.googlecode.wicket.jquery.core.Options;
import com.googlecode.wicket.jquery.ui.interaction.droppable.Droppable;
+import com.googlecode.wicket.jquery.ui.settings.JQueryUILibrarySettings;
import
de.agilecoders.wicket.core.markup.html.bootstrap.button.BootstrapAjaxLink;
import de.agilecoders.wicket.core.markup.html.bootstrap.button.Buttons;
@@ -679,7 +681,14 @@ public class RoomPanel extends BasePanel {
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
response.render(new
PriorityHeaderItem(JavaScriptHeaderItem.forReference(interview ?
INTERVIEWWB_JS_REFERENCE : WB_JS_REFERENCE)));
- response.render(new
PriorityHeaderItem(JavaScriptHeaderItem.forReference(new
JavaScriptResourceReference(RoomPanel.class, "room.js";
+ response.render(new
PriorityHeaderItem(JavaScriptHeaderItem.forReference(new
JavaScriptResourceReference(RoomPanel.class, "room.js"))) {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public List getDependencies() {
+ return List.of(new
PriorityHeaderItem(JavaScriptHeaderItem.forReference(JQueryUILibrarySettings.get().getJavaScriptReference(;
+ }
+ });
response.render(JavaScriptHeaderItem.forReference(TouchPunchResourceReference.instance()));
if (room.isVisible()) {
response.render(OnDomReadyHeaderItem.forScript(roomEnter.getCallbackScript()));
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java
index ef941e3..fdd7598 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java
@@ -60,8 +60,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.github.openjson.JSONObject;
-
-import
de.agilecoders.wicket.extensions.markup.html.bootstrap.jqueryui.JQueryUIJavaScriptReference;
+import com.googlecode.wicket.jquery.ui.settings.JQueryUILibrarySettings;
public class Chat extends Panel {
private static final long serialVersionUID = 1L;
@@ -178,7 +177,7 @@ public class Chat extends Panel {
@Override
public List getDependencies() {
return
List.of(JavaScriptHeaderItem.forScript("const bstooltip = jQuery.fn.tooltip;",
"preserve-bs-tooltip")
- ,
JQueryUIJavaScriptReference.asHeaderItem()
+ ,
JavaScriptHeaderItem.forReference(JQueryUILibrarySettings.get().getJavaScriptReference())
,
JavaScriptHeaderItem.forScript("jQuery.fn.tooltip = bstooltip;",
"restore-bs-tooltip")
);
}
