Skip to content
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

Jump to bottom

8240969: WebView does not allow to load style sheet in modularized applications #22

Closed
wants to merge 4 commits into from
Closed

8240969: WebView does not allow to load style sheet in modularized applications #22

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
391c4fa
WebView: Allow to load style sheet from jlink images
tobiasdiez Oct 24, 2019
f58ddfc
Add test
tobiasdiez Apr 14, 2020
717dd93
Remove whitespace
tobiasdiez Aug 2, 2020
ad72fd6
Update MiscellaneousTest.java
tobiasdiez Aug 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion modules/javafx.web/src/main/java/javafx/scene/web/WebEngine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -491,7 +491,7 @@ public final BooleanProperty javaScriptEnabledProperty() {
* Location of the user stylesheet as a string URL.
*
* <p>This should be a local URL, i.e. either {@code 'data:'},
* {@code 'file:'}, or {@code 'jar:'}. Remote URLs are not allowed
* {@code 'file:'}, {@code 'jar:'}, or {@code 'jrt:'}. Remote URLs are not allowed
* for security reasons.
*
* @defaultValue null
Expand Down Expand Up @@ -554,6 +554,7 @@ public final StringProperty userStyleSheetLocationProperty() {
dataUrl = url;
} else if (url.startsWith("file:") ||
url.startsWith("jar:") ||
url.startsWith("jrt:") ||
url.startsWith("data:"))
{
try {
Expand Down
4 changes: 4 additions & 0 deletions modules/javafx.web/src/test/java/test/javafx/scene/web/MiscellaneousTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,4 +473,8 @@ void waitForCompletion() {
assertNull(getEngine().executeScript("window.xmlDoc.body"));
});
}

@Test public void loadJrtCssFileSuccessfully() {
getEngine().setUserStyleSheetLocation("jrt:/javafx.web/html/imported-styles.css");
kevinrushforth marked this conversation as resolved.
Show resolved Hide resolved
}
}