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

web: On pages with restrictive CSP show open in new tab option for SWF #17152

Merged
merged 3 commits into from
Jul 17, 2024
Merged

web: On pages with restrictive CSP show open in new tab option for SWF #17152

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5507d7b
web: On pages with restrictive CSP show open in new tab option for SWF
danielhjacobs Jul 17, 2024
7be7788
web: Fix issue with error checking in panic function
danielhjacobs Jul 17, 2024
2797f78
web: Check error type instead of error message
danielhjacobs Jul 17, 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
64 changes: 38 additions & 26 deletions web/packages/core/src/ruffle-player.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1973,6 +1973,14 @@ export class RufflePlayer extends HTMLElement {
) {
// Firefox: Don't display the panic screen if the user leaves the page while something is still loading
return;
} else if (error instanceof LoadRuffleWasmError) {
const openInNewTab = this.loadedConfig?.openInNewTab;
const swfUrl = this.loadedConfig && "url" in this.loadedConfig ? new URL(this.loadedConfig.url, document.baseURI) : undefined;
if (openInNewTab && swfUrl) {
// If it is possible to open the SWF in a new tab offer that option if the WASM failed to load
this.addOpenInNewTabMessage(openInNewTab, swfUrl);
return;
}
}

const errorArray: Array<string | null> & {
Expand Down Expand Up @@ -2017,39 +2025,43 @@ export class RufflePlayer extends HTMLElement {
this.destroy();
}

private addOpenInNewTabMessage(openInNewTab: (swf: URL) => void, swfUrl: URL) {
const url = new URL(swfUrl);
if (this.loadedConfig?.parameters) {
const parameters = sanitizeParameters(
this.loadedConfig?.parameters,
);
Object.entries(parameters).forEach(([key, value]) => {
url.searchParams.set(key, value);
});
}
this.hideSplashScreen();

const div = document.createElement("div");
div.id = "message-overlay";
const innerDiv = document.createElement("div");
innerDiv.className = "message";
innerDiv.appendChild(textAsParagraphs("message-cant-embed"));

const buttonDiv = document.createElement("div");
const link = document.createElement("a");
link.innerText = text("open-in-new-tab");
link.onclick = () => openInNewTab(url);
buttonDiv.appendChild(link);

innerDiv.appendChild(buttonDiv);
div.appendChild(innerDiv);
this.container.prepend(div);
}

protected displayRootMovieDownloadFailedMessage(invalidSwf: boolean): void {
const openInNewTab = this.loadedConfig?.openInNewTab;
if (
openInNewTab &&
this.swfUrl &&
window.location.origin !== this.swfUrl.origin
) {
const url = new URL(this.swfUrl);
if (this.loadedConfig?.parameters) {
const parameters = sanitizeParameters(
this.loadedConfig?.parameters,
);
Object.entries(parameters).forEach(([key, value]) => {
url.searchParams.set(key, value);
});
}
this.hideSplashScreen();

const div = document.createElement("div");
div.id = "message-overlay";
const innerDiv = document.createElement("div");
innerDiv.className = "message";
innerDiv.appendChild(textAsParagraphs("message-cant-embed"));

const buttonDiv = document.createElement("div");
const link = document.createElement("a");
link.innerText = text("open-in-new-tab");
link.onclick = () => openInNewTab(url);
buttonDiv.appendChild(link);

innerDiv.appendChild(buttonDiv);
div.appendChild(innerDiv);
this.container.prepend(div);
this.addOpenInNewTabMessage(openInNewTab, this.swfUrl);
} else {
const error = invalidSwf
? new InvalidSwfError(this.swfUrl)
Expand Down