Fix "Open in new window" context menu action in release builds #2873
Conversation
This file contains 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
absidue
requested review from
PikachuEXE,
efb4f5ff-1298-471a-8973-3d47447115dc and
ChunkyProgrammer
github-actions
bot
added
the
PR: waiting for review
PikachuEXE
requested changes
Nov 19, 2022
src/main/index.js
Outdated
| @@ -31,7 +31,7 @@ function runApp() { | |||
| }, | |||
| { | |||
| label: 'Open in a New Window', | |||
| visible: parameters.linkURL.includes((new URL(browserWindow.webContents.getURL())).origin), | |||
| visible: parameters.linkURL.startsWith(browserWindow.webContents.getURL()), | |||
There was a problem hiding this comment.
Probably should add code comment to document this pitfall
PikachuEXE
approved these changes
Nov 21, 2022
ChunkyProgrammer
approved these changes
Nov 21, 2022
efb4f5ff-1298-471a-8973-3d47447115dc
approved these changes
Nov 21, 2022
github-actions
bot
removed
the
PR: waiting for review
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.
Fix "Open in new window" context menu action in release builds
Pull Request Type
Related issue
Partially addresses #2832
Description
In the release builds, all files are accessed using the
file:protocol, including the index.html file. Interestingly how thenew URL()class handles file URLs differs depending on the implementation. In node theoriginfield isnull, in Firefox it's a string with null in it"null"and in Chromium it'sfile:///. In release builds, the current implementation was checking if the linkURL containednull, which it never did, so it always hid the context menu entry.In dev builds the files are served from the webpack dev server (http://localhost:9080) so the previous implementation worked fine there.
Testing
yarn buildDesktop