]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge pull request #18900 from vlastikcz/v4-dev-buttonChange
authorMark Otto <markd.otto@gmail.com>
Sat, 26 Nov 2016 09:18:21 +0000 (01:18 -0800)
committerGitHub <noreply@github.com>
Sat, 26 Nov 2016 09:18:21 +0000 (01:18 -0800)
Button toggling - trigger change event on input. Fixes #16673, fixes #17599.

1  2 
js/src/button.js
js/tests/unit/button.js

index 8b95117657677a47135e1de9b32708e20d6d9bc4,f5551f169e51b26536ac05d62a94c7457e54e498..45e1424ffdcfee58cc7eee901b032179ea7eb109
@@@ -90,12 -90,9 +90,12 @@@ const Button = (($) => 
  
            if (triggerChangeEvent) {
              input.checked = !$(this._element).hasClass(ClassName.ACTIVE)
-             $(this._element).trigger('change')
+             $(input).trigger('change')
            }
 +
 +          input.focus()
          }
 +
        } else {
          this._element.setAttribute('aria-pressed',
            !$(this._element).hasClass(ClassName.ACTIVE))
Simple merge