This repository has been archived by the owner on Dec 11, 2019. It is now read-only.
Only store menu in appState on Windows #9991
Merged
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
bsclifton
commented
Jul 14, 2017
app/browser/menu.js
Outdated
| if (isWindows) { | ||
| const menuDataOnly = JSON.parse(JSON.stringify(template)) | ||
| appActions.setMenubarTemplate(Immutable.fromJS(menuDataOnly)) | ||
| } |
There was a problem hiding this comment.
This is not ideal- could use some help finding a better way to do this
bsclifton
commented
Jul 14, 2017
app/common/lib/platformUtil.js
Outdated
| } | ||
|
|
||
| module.exports.isWindows = () => { | ||
| return process.platform === 'win32' || | ||
| (navigator && navigator.platform === 'Win32') | ||
| (typeof navigator !== 'undefined' && navigator.platform === 'Win32') |
There was a problem hiding this comment.
This is needed because navigator is undefined in the browser process (which causes a crash).
|
I can make an issue for this too (if it makes sense) |
|
OK made some tweaks, ready for re-review @bridiver @bbondy Here are some important notes:
Some notes about existing behavior
|
8 tasks
|
Could you post or link up an issue for this? Thanks. |
- methods are stripped out (will no longer be serialized) - with a few thousand bookmarks, the initial stringify/parse takes ~60ms and is never done again - menu (if present) is now deleted when saving session Fixes #10016 Some notes about existing behavior The menu is modified in memory when: - tab is closed (history menu rebuilt - serialization added w/ this PR taking 0 ms) - menu item goes from checked to unchecked (or similar) Auditors: @bridiver, @bbondy
bbondy
reviewed
Jul 17, 2017
| @@ -602,7 +606,10 @@ const createMenu = (state) => { | |||
| }) | |||
| } | |||
|
|
|||
| appActions.setMenubarTemplate(Immutable.fromJS(template)) | |||
| if (isWindows) { | |||
| const menuTemplate = JSON.parse(JSON.stringify(template)) | |||
There was a problem hiding this comment.
I talked to Clifton, the handlers aren't actually used in app state and this is only called once.
bbondy
approved these changes
Jul 17, 2017
bsclifton
pushed a commit
that referenced
this pull request
Jul 17, 2017
Only store menu in appState on Windows
bsclifton
pushed a commit
that referenced
this pull request
Jul 17, 2017
Only store menu in appState on Windows
bsclifton
pushed a commit
that referenced
this pull request
Jul 17, 2017
Only store menu in appState on Windows
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
... and even then, store only the data (don't serialize functions, etc).
Auditors: @bridiver, @bbondy
Submitter Checklist:
git rebase -ito squash commits (if needed).Reviewer Checklist:
Tests