aboutsummaryrefslogtreecommitdiff
path: root/js/src/button.js
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2017-05-01 21:54:50 -0700
committerGitHub <[email protected]>2017-05-01 21:54:50 -0700
commit8c7fe6cf147e98fb5d8096f6e6536bcb4e207586 (patch)
treed33635083f70814945e92cb17957b6c522073379 /js/src/button.js
parentca44f5b03a9707dda74e1aa3f92a1b54de3ec6d5 (diff)
parente00de46540818fa11feb6d1f0e8b0089ba56f082 (diff)
downloadbootstrap-8c7fe6cf147e98fb5d8096f6e6536bcb4e207586.tar.xz
bootstrap-8c7fe6cf147e98fb5d8096f6e6536bcb4e207586.zip
Merge branch 'v4-dev' into form-tweaks
Diffstat (limited to 'js/src/button.js')
-rw-r--r--js/src/button.js6
1 files changed, 6 insertions, 0 deletions
diff --git a/js/src/button.js b/js/src/button.js
index 6295d0db0..722fd489d 100644
--- a/js/src/button.js
+++ b/js/src/button.js
@@ -90,6 +90,12 @@ const Button = (($) => {
}
if (triggerChangeEvent) {
+ if (input.hasAttribute('disabled') ||
+ rootElement.hasAttribute('disabled') ||
+ input.classList.contains('disabled') ||
+ rootElement.classList.contains('disabled')) {
+ return
+ }
input.checked = !$(this._element).hasClass(ClassName.ACTIVE)
$(input).trigger('change')
}