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.

Sign up for GitHub

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

Fixed #21237 - Toggle buttons don't honor [disabled] or .disabled #22499

Merged
merged 4 commits into from
Apr 26, 2017
Merged

Fixed #21237 - Toggle buttons don't honor [disabled] or .disabled #22499

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3fe4fa8
Fixed #21237 - Toggle buttons don't honor [disabled] or .disabled
anniepank Apr 22, 2017
fd10cad
#22499 - use `hasAttribute` for disabled button checks
anniepank Apr 24, 2017
4e477ee
#22499 - tests added
anniepank Apr 25, 2017
77c60fb
Merge branch 'v4-dev' into fix-21237
Apr 25, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions js/src/button.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,11 @@ const Button = (($) => {
}

if (triggerChangeEvent) {
if (input.disabled || rootElement.disabled ||
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

there shouldn't be a need to check if the element is actually disabled, as this would only be exposed for elements that actually support the disabled attribute (e.g. <button>), and those elements wouldn't trigger the click event anyway when clicked)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@patrickhlauke done!

input.classList.contains('disabled') ||
rootElement.classList.contains('disabled')) {
return
}
input.checked = !$(this._element).hasClass(ClassName.ACTIVE)
$(input).trigger('change')
}
Expand Down