Fix: App bootup fails in browser due to missing isElectron checks #2168
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
dmsnell
reviewed
Jun 25, 2020
lib/app.tsx
Outdated
| 'setAutoHideMenuBar', | ||
| this.props.settings.autoHideMenuBar | ||
| ); | ||
| window.electron.send('settingsUpdate', this.props.settings); |
There was a problem hiding this comment.
also acceptable would be to use optional chaining, which I slightly prefer at the moment due to its brevity… (doesn't require isElectron)
window.electron?.receive('appCommand', this.onAppCommand);
window.electron?.send( 'setAutoHideMenuBar', this.props.settings.autoHideMenuBar );
window.electron?.send('settingsUpdate', this.props.settings);the tradeoff could be argued as losing the context that this is intended to run only in Electron but I feel like that's obvious given the project and also given the naming
dmsnell
reviewed
Jun 25, 2020
lib/app.tsx
Outdated
| @@ -178,7 +180,7 @@ export const App = connect( | |||
| componentDidUpdate(prevProps) { | |||
| const { settings } = this.props; | |||
|
|
|||
| if (settings !== prevProps.settings) { | |||
| if (settings !== prevProps.settings && isElectron) { | |||
There was a problem hiding this comment.
same here… with optional chaining we don't need the additional check
dmsnell
approved these changes
Jun 25, 2020
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
Introduced in #2102. Right now loading in browser yields the following error:
TypeError: window.electron is undefinedfyi @belcherj