diff options
| author | Mark Otto <[email protected]> | 2016-12-19 21:44:03 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2016-12-19 21:44:03 -0800 |
| commit | 8eeb71c91c39c01142d2501e6feda7e4f09f8205 (patch) | |
| tree | e7b751ac49ede3082cd200d38846c95751825a1c /js/src/dropdown.js | |
| parent | 7e5f21c2b4e5d28b75f58de1509699eaa49c4872 (diff) | |
| parent | d991c868a4b9b598a622f739547f71ee0ea7a352 (diff) | |
| download | bootstrap-8eeb71c91c39c01142d2501e6feda7e4f09f8205.tar.xz bootstrap-8eeb71c91c39c01142d2501e6feda7e4f09f8205.zip | |
Merge branch 'fix-20982' of https://github.com/Starsam80/bootstrap into Starsam80-fix-20982
Diffstat (limited to 'js/src/dropdown.js')
| -rw-r--r-- | js/src/dropdown.js | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/js/src/dropdown.js b/js/src/dropdown.js index 8b2164aa9..97bba1c76 100644 --- a/js/src/dropdown.js +++ b/js/src/dropdown.js @@ -41,7 +41,7 @@ const Dropdown = (($) => { const ClassName = { BACKDROP : 'dropdown-backdrop', DISABLED : 'disabled', - ACTIVE : 'active' + SHOW : 'show' } const Selector = { @@ -86,7 +86,7 @@ const Dropdown = (($) => { } const parent = Dropdown._getParentFromElement(this) - const isActive = $(parent).hasClass(ClassName.ACTIVE) + const isActive = $(parent).hasClass(ClassName.SHOW) Dropdown._clearMenus() @@ -118,7 +118,7 @@ const Dropdown = (($) => { this.focus() this.setAttribute('aria-expanded', true) - $(parent).toggleClass(ClassName.ACTIVE) + $(parent).toggleClass(ClassName.SHOW) $(parent).trigger($.Event(Event.SHOWN, relatedTarget)) return false @@ -176,7 +176,7 @@ const Dropdown = (($) => { relatedTarget : toggles[i] } - if (!$(parent).hasClass(ClassName.ACTIVE)) { + if (!$(parent).hasClass(ClassName.SHOW)) { continue } @@ -195,7 +195,7 @@ const Dropdown = (($) => { toggles[i].setAttribute('aria-expanded', 'false') $(parent) - .removeClass(ClassName.ACTIVE) + .removeClass(ClassName.SHOW) .trigger($.Event(Event.HIDDEN, relatedTarget)) } } @@ -225,7 +225,7 @@ const Dropdown = (($) => { } const parent = Dropdown._getParentFromElement(this) - const isActive = $(parent).hasClass(ClassName.ACTIVE) + const isActive = $(parent).hasClass(ClassName.SHOW) if (!isActive && event.which !== ESCAPE_KEYCODE || isActive && event.which === ESCAPE_KEYCODE) { |