Skip to content

Refactoring/#931 update JQuery UI dashboard webjars #932

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
solomax merged 5 commits into from
Jun 7, 2024
Merged

Refactoring/#931 update JQuery UI dashboard webjars #932

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c597a09
#931 Use JQuery UI webjars
mcr-paulanand Jun 7, 2024
4301b77
#931 Remove bundled JQuery UI
mcr-paulanand Jun 7, 2024
bbdff96
#931 Fixed indentations
mcr-paulanand Jun 7, 2024
e4df3d3
Revert "#931 Fixed indentations"
mcr-paulanand Jun 7, 2024
0fb081a
#931 Fixed indentations
mcr-paulanand Jun 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions dashboard-parent/dashboard-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,16 @@
<artifactId>xstream</artifactId>
</dependency>

<!-- WebJars -->
<dependency>
<groupId>de.agilecoders.wicket.webjars</groupId>
<artifactId>wicket-webjars</artifactId>
</dependency>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>jquery-ui</artifactId>
</dependency>

<!-- Testing -->
<dependency>
<groupId>org.junit.jupiter</groupId>
Expand Down
1 change: 1 addition & 0 deletions dashboard-parent/dashboard-core/src/main/java/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@
requires org.apache.wicket.util;
requires xstream;
requires com.google.gson;
requires de.agilecoders.wicket.webjars;
}
4 changes: 2 additions & 2 deletions ...-parent/dashboard-core/src/main/java/org/wicketstuff/dashboard/web/DashboardSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import org.apache.wicket.MetaDataKey;
import org.apache.wicket.request.resource.PackageResourceReference;
import org.apache.wicket.request.resource.ResourceReference;
import de.agilecoders.wicket.webjars.request.resource.WebjarsJavaScriptResourceReference;

/**
* {@link DashboardSettings} which allows to specify set of resources for inclusion in an page header
Expand All @@ -32,8 +33,7 @@ public class DashboardSettings {
DashboardSettings.class, "res/dashboard.css");
private ResourceReference rtlCssReference = new PackageResourceReference(
DashboardSettings.class, "res/dashboard-rtl.css");
private ResourceReference jqueryUIReference = new PackageResourceReference(
DashboardSettings.class, "res/jquery-ui-1.13.0.min.js");
private ResourceReference jqueryUIReference = new WebjarsJavaScriptResourceReference("jquery-ui/current/jquery-ui.js");

private boolean includeJQueryUI = true;
private boolean includeJavaScript = true;
Expand Down
6 changes: 0 additions & 6 deletions ...nt/dashboard-core/src/main/java/org/wicketstuff/dashboard/web/res/jquery-ui-1.13.0.min.js
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions ...ard-parent/dashboard-core/src/test/java/org/wicketstuff/dashboard/AbstractWidgetTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat;

import de.agilecoders.wicket.webjars.WicketWebjars;
import org.apache.wicket.Application;
import org.apache.wicket.MetaDataKey;
import org.apache.wicket.Page;
Expand Down Expand Up @@ -36,6 +37,7 @@ public Class<? extends Page> getHomePage() {
@Override
protected void init() {
super.init();
WicketWebjars.install(this);
DashboardContext dashboardContext = this.getMetaData(DashboardContextInitializer.DASHBOARD_CONTEXT_KEY);
WidgetDescriptor widgetDescriptor;
dashboardContext.getWidgetRegistry().registerWidget(widgetDescriptor = new MyWidgetDescriptor());
Expand Down
2 changes: 2 additions & 0 deletions ...ashboard-examples/src/main/java/org/wicketstuff/dashboard/examples/WicketApplication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

import static org.wicketstuff.dashboard.DashboardContextInitializer.getDashboardContext;

import de.agilecoders.wicket.webjars.WicketWebjars;
import org.apache.wicket.Page;
import org.apache.wicket.protocol.http.WebApplication;
import org.wicketstuff.dashboard.Dashboard;
Expand All @@ -39,6 +40,7 @@ public static WicketApplication get() {
@Override
public void init() {
super.init();
WicketWebjars.install(this);

getCspSettings().blocking().disabled();

Expand Down