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.

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

Prevent circular Menu require #7110

Merged
merged 1 commit into from Sep 7, 2016

Conversation

Projects
None yet
2 participants
@kevinsawicki
Copy link
Contributor

kevinsawicki commented Sep 6, 2016

#6480 added requiring webContents from Menu which caused a circular require causing the Menu.buildFromTemplate function to be missing which was used by the pepper flash context menu.

This pull request accesses Menu from webContents via electron.Menu so that the function is available once the require loop completes.

Closes #7086

@zcbenz

This comment has been minimized.

Copy link
Member

zcbenz commented Sep 7, 2016

👍

@zcbenz zcbenz merged commit ade60ed into master Sep 7, 2016

9 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
electron-linux-arm Build #4045089 succeeded in 78s
Details
electron-linux-ia32 Build #4045090 succeeded in 73s
Details
electron-linux-x64 Build #4045091 succeeded in 109s
Details
electron-mas-x64 Build #2299 succeeded in 6 min 1 sec
Details
electron-osx-x64 Build #2307 succeeded in 7 min 16 sec
Details
electron-win-ia32 Build #1361 succeeded in 6 min 37 sec
Details
electron-win-x64 Build #1339 succeeded in 6 min 31 sec
Details

@zcbenz zcbenz deleted the circular-menu-require branch Sep 7, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.