diff options
| author | Johann-S <[email protected]> | 2016-10-24 10:57:32 +0200 |
|---|---|---|
| committer | Johann-S <[email protected]> | 2016-10-25 14:07:41 +0200 |
| commit | 9d129a43d6c24d9e60cc8fc7cfbddaaa4c586fdf (patch) | |
| tree | d2bebaf0ed5680d7a3c86c22e5528afde936a7de /js/src/dropdown.js | |
| parent | f11f630acd4b0cfad3188d125241a41b6ab11627 (diff) | |
| download | bootstrap-9d129a43d6c24d9e60cc8fc7cfbddaaa4c586fdf.tar.xz bootstrap-9d129a43d6c24d9e60cc8fc7cfbddaaa4c586fdf.zip | |
Use a single class name for opened/expanded/shown state of widgets
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 656a05e77..3246e6bef 100644 --- a/js/src/dropdown.js +++ b/js/src/dropdown.js @@ -41,7 +41,7 @@ const Dropdown = (($) => { const ClassName = { BACKDROP : 'dropdown-backdrop', DISABLED : 'disabled', - OPEN : 'open' + ACTIVE : 'active' } const Selector = { @@ -86,7 +86,7 @@ const Dropdown = (($) => { } let parent = Dropdown._getParentFromElement(this) - let isActive = $(parent).hasClass(ClassName.OPEN) + let isActive = $(parent).hasClass(ClassName.ACTIVE) Dropdown._clearMenus() @@ -116,7 +116,7 @@ const Dropdown = (($) => { this.focus() this.setAttribute('aria-expanded', 'true') - $(parent).toggleClass(ClassName.OPEN) + $(parent).toggleClass(ClassName.ACTIVE) $(parent).trigger($.Event(Event.SHOWN, relatedTarget)) return false @@ -171,7 +171,7 @@ const Dropdown = (($) => { let parent = Dropdown._getParentFromElement(toggles[i]) let relatedTarget = { relatedTarget : toggles[i] } - if (!$(parent).hasClass(ClassName.OPEN)) { + if (!$(parent).hasClass(ClassName.ACTIVE)) { continue } @@ -190,7 +190,7 @@ const Dropdown = (($) => { toggles[i].setAttribute('aria-expanded', 'false') $(parent) - .removeClass(ClassName.OPEN) + .removeClass(ClassName.ACTIVE) .trigger($.Event(Event.HIDDEN, relatedTarget)) } } @@ -220,7 +220,7 @@ const Dropdown = (($) => { } let parent = Dropdown._getParentFromElement(this) - let isActive = $(parent).hasClass(ClassName.OPEN) + let isActive = $(parent).hasClass(ClassName.ACTIVE) if ((!isActive && event.which !== ESCAPE_KEYCODE) || (isActive && event.which === ESCAPE_KEYCODE)) { |