mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-23 21:53:25 +02:00
Code Issues Releases Wiki Activity

Use a single class name for opened/expanded/shown state of widgets

Browse Source
This commit is contained in:
Johann-S
2016-10-24 10:57:32 +02:00
parent f11f630acd
commit 9d129a43d6
19 changed files with 113 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
js/src/dropdown.js
View File

@@ -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)) {