diff options
| author | Pierre-Denis Vanduynslager <[email protected]> | 2017-01-06 15:57:15 -0500 |
|---|---|---|
| committer | Pierre-Denis Vanduynslager <[email protected]> | 2017-01-06 15:57:15 -0500 |
| commit | 4c2f5443596c39c551ebb7ec635d01a98e434189 (patch) | |
| tree | 3bb7d0a5bcd80e2758578c8d597c7554d7fd4b0c /js/src/button.js | |
| parent | eb84c03ddf5993d701724250507055b4e394fbdb (diff) | |
| parent | 65ffb1c3b6e94440812a2e228cb8e8be512652ec (diff) | |
| download | bootstrap-4c2f5443596c39c551ebb7ec635d01a98e434189.tar.xz bootstrap-4c2f5443596c39c551ebb7ec635d01a98e434189.zip | |
Merge branch 'twbs/v4-dev' into dropdown-keyboard
Diffstat (limited to 'js/src/button.js')
| -rw-r--r-- | js/src/button.js | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/js/src/button.js b/js/src/button.js index 45e1424ff..76c5cdd15 100644 --- a/js/src/button.js +++ b/js/src/button.js @@ -1,6 +1,6 @@ /** * -------------------------------------------------------------------------- - * Bootstrap (v4.0.0-alpha.5): button.js + * Bootstrap (v4.0.0-alpha.6): button.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -15,7 +15,7 @@ const Button = (($) => { */ const NAME = 'button' - const VERSION = '4.0.0-alpha.5' + const VERSION = '4.0.0-alpha.6' const DATA_KEY = 'bs.button' const EVENT_KEY = `.${DATA_KEY}` const DATA_API_KEY = '.data-api' @@ -96,11 +96,11 @@ const Button = (($) => { input.focus() } - } else { - this._element.setAttribute('aria-pressed', - !$(this._element).hasClass(ClassName.ACTIVE)) } + this._element.setAttribute('aria-pressed', + !$(this._element).hasClass(ClassName.ACTIVE)) + if (triggerChangeEvent) { $(this._element).toggleClass(ClassName.ACTIVE) } |