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 80cfe83 [OPENMEETINGS-2513] code clean-up 80cfe83 is described below commit 80cfe8355e184667bc93c4ea14d5f34929810fe2 Author: Maxim Solodovnik <solomax...@gmail.com> AuthorDate: Wed Nov 18 22:37:27 2020 +0700 [OPENMEETINGS-2513] code clean-up --- .../src/main/java/org/apache/openmeetings/web/pages/BasePage.java | 2 +- .../src/main/java/org/apache/openmeetings/web/user/chat/Chat.java | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java index 0c993f0..c26357c 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java @@ -137,7 +137,7 @@ public abstract class BasePage extends AsyncUrlFragmentAwarePage { @Override public List<HeaderItem> getDependencies() { - return List.of(JavaScriptHeaderItem.forUrl("https://www.googletagmanager.com/gtag/js?id=" + getGaCode()).setAsync(true)); + return List.of(new PriorityHeaderItem(JavaScriptHeaderItem.forUrl("https://www.googletagmanager.com/gtag/js?id=" + getGaCode()).setAsync(true))); } }))); StringBuilder script = new StringBuilder("initGA('") 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 fdd7598..3d91602 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 @@ -176,9 +176,10 @@ public class Chat extends Panel { @Override public List<HeaderItem> getDependencies() { - return List.of(JavaScriptHeaderItem.forScript("const bstooltip = jQuery.fn.tooltip;", "preserve-bs-tooltip") - , JavaScriptHeaderItem.forReference(JQueryUILibrarySettings.get().getJavaScriptReference()) - , JavaScriptHeaderItem.forScript("jQuery.fn.tooltip = bstooltip;", "restore-bs-tooltip") + return List.of( + new PriorityHeaderItem(JavaScriptHeaderItem.forScript("const bstooltip = jQuery.fn.tooltip;", "preserve-bs-tooltip")) + , new PriorityHeaderItem(JavaScriptHeaderItem.forReference(JQueryUILibrarySettings.get().getJavaScriptReference())) + , new PriorityHeaderItem(JavaScriptHeaderItem.forScript("jQuery.fn.tooltip = bstooltip;", "restore-bs-tooltip")) ); } });