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
Merged

Prevent circular Menu require #7110

merged 1 commit into from
Sep 7, 2016

Conversation

kevinsawicki
Copy link
Contributor

#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
Copy link
Contributor

zcbenz commented Sep 7, 2016

👍

@zcbenz zcbenz merged commit ade60ed into master Sep 7, 2016
@zcbenz zcbenz deleted the circular-menu-require branch September 7, 2016 07:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants