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

fix: register accelerator if role has no registerAccelerator #16309

Merged
merged 2 commits into from Jan 8, 2019

Conversation

codebytere
Copy link
Member

@codebytere codebytere commented Jan 7, 2019

Description of Change

Resolves #16303.

Previously, registerAccelerator defaulted to true only if there was no role for the menu item. If there is a role set, it instead used the registerAccelerator property for that role; however many of the roles had an undefined registerAccelerator.

This therefore changes behavior such that a MenuItem will only be set to roles[role].registerAccelerator if it has a role AND that role has a defined registerAccelerator property.

/cc @brenca

Checklist

Release Notes

Notes: Fixed an issue whereby registerAccelerator was being set to the registerAccelerator property of its role even when registerAccelerator was undefined.

@codebytere codebytere requested a review from a team January 7, 2019 20:46
@release-clerk
Copy link

release-clerk bot commented Jan 8, 2019

Release Notes Persisted

Fixed an issue whereby registerAccelerator was being set to the registerAccelerator property of its role even when registerAccelerator was undefined.

@trop
Copy link
Contributor

trop bot commented Jan 8, 2019

I have automatically backported this PR to "4-0-x", please check out #16314

akisctx pushed a commit to akisctx/electron that referenced this pull request Jan 22, 2019
…n#16309)

* fix: register accelerator if role has no registerAccelerator

* ensure roles[role].registerAccelerator  is defined
@codebytere
Copy link
Member Author

/trop run backport-to 3-1-x

@trop
Copy link
Contributor

trop bot commented Jan 29, 2019

The backport process for this PR has been manually initiated,
sending your 1's and 0's to "3-1-x" here we go! :D

@trop
Copy link
Contributor

trop bot commented Jan 29, 2019

I have automatically backported this PR to "3-1-x", please check out #16598

@sofianguy sofianguy added this to Fixed in 3.1.3 in 3.1.x Jan 31, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
No open projects
3.1.x
Fixed in 3.1.3
Development

Successfully merging this pull request may close these issues.

None yet

3 participants