diff options
| author | Pierre Vanduynslager <[email protected]> | 2017-04-10 11:04:05 -0400 |
|---|---|---|
| committer | GitHub <[email protected]> | 2017-04-10 11:04:05 -0400 |
| commit | 025ddb185e863e40d455325c539afc5c3dbedc41 (patch) | |
| tree | 85803bb95a20cd665e605b4ef8c2e939666d84de /js/src | |
| parent | d3fbebefcd8a0931f51341c8fe59a075578753c8 (diff) | |
| parent | 18e8704221791e70d0bf4ac9ff45d4e897a02e63 (diff) | |
| download | bootstrap-025ddb185e863e40d455325c539afc5c3dbedc41.tar.xz bootstrap-025ddb185e863e40d455325c539afc5c3dbedc41.zip | |
Merge branch 'v4-dev' into dropdown-keyboard
Diffstat (limited to 'js/src')
| -rw-r--r-- | js/src/button.js | 8 | ||||
| -rw-r--r-- | js/src/collapse.js | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/js/src/button.js b/js/src/button.js index 76c5cdd15..6295d0db0 100644 --- a/js/src/button.js +++ b/js/src/button.js @@ -66,6 +66,7 @@ const Button = (($) => { toggle() { let triggerChangeEvent = true + let addAriaPressed = true const rootElement = $(this._element).closest( Selector.DATA_TOGGLE )[0] @@ -94,12 +95,15 @@ const Button = (($) => { } input.focus() + addAriaPressed = false } } - this._element.setAttribute('aria-pressed', - !$(this._element).hasClass(ClassName.ACTIVE)) + if (addAriaPressed) { + this._element.setAttribute('aria-pressed', + !$(this._element).hasClass(ClassName.ACTIVE)) + } if (triggerChangeEvent) { $(this._element).toggleClass(ClassName.ACTIVE) diff --git a/js/src/collapse.js b/js/src/collapse.js index 88428310d..dec272297 100644 --- a/js/src/collapse.js +++ b/js/src/collapse.js @@ -162,7 +162,6 @@ const Collapse = (($) => { .addClass(ClassName.COLLAPSING) this._element.style[dimension] = 0 - this._element.setAttribute('aria-expanded', true) if (this._triggerArray.length) { $(this._triggerArray) @@ -223,8 +222,6 @@ const Collapse = (($) => { .removeClass(ClassName.COLLAPSE) .removeClass(ClassName.SHOW) - this._element.setAttribute('aria-expanded', false) - if (this._triggerArray.length) { $(this._triggerArray) .addClass(ClassName.COLLAPSED) @@ -300,7 +297,6 @@ const Collapse = (($) => { _addAriaAndCollapsedClass(element, triggerArray) { if (element) { const isOpen = $(element).hasClass(ClassName.SHOW) - element.setAttribute('aria-expanded', isOpen) if (triggerArray.length) { $(triggerArray) |