web: If fetch fails because HttpNotOk, always display error-swf-fetch #20792
+37
−16
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
danielhjacobs
added
A-web
n0samu
reviewed
Jun 20, 2025
n0samu
approved these changes
Jun 20, 2025
danielhjacobs
changed the title
danielhjacobs
commented
Jun 20, 2025
| @@ -2070,9 +2073,12 @@ export class InnerPlayer { | |||
| ) { | |||
| this.addOpenInNewTabMessage(openInNewTab, this.swfUrl); | |||
| } else { | |||
| const fetchStatusNotOk = fetchError.includes( | |||
| "HTTP Status is not OK:", | |||
| ); | |||
There was a problem hiding this comment.
Lines 182 to 183 in fb9bddd
|
PR has been changed (commits should be squashed if this approach is taken, they are separate so I can revert to the old approach if preferred). Now, if the |
danielhjacobs
commented
Jun 20, 2025
| @@ -185,6 +185,7 @@ function createPanicError(error: Error | null): { | |||
|
|
|||
| if ( | |||
| window.location.origin === error.swfUrl?.origin || | |||
| error.statusNotOk || | |||
| // The extension's internal player page is not restricted by CORS | |||
There was a problem hiding this comment.
The other checks can probably be removed from here, but not certain.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Unfortunately, it's another new parameter to display_root_movie_download_failed_message (see #14715), but I think it should work as another way to accomplish #20770 without a hard-coded URL.