rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-20 17:54:23 +01:00
Code Issues Actions Packages Releases Activity

Add isShown method and reuse it

Browse Source
This commit is contained in:
GeoSot 2021-06-10 17:51:01 +03:00 committed by XhmikosR
parent da2db218ed
commit d3c6f25fd0
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
js/src/dropdown.js
View File

@ -11,12 +11,12 @@ import {
defineJQueryPlugin,
getElement,
getElementFromSelector,
getNextActiveElement,
isDisabled,
isElement,
isVisible,
isRTL,
isVisible,
noop,
getNextActiveElement,
typeCheckConfig
} from './util/index'
import EventHandler from './dom/event-handler'
@ -128,7 +128,7 @@ class Dropdown extends BaseComponent {
return
}
const isActive = this._element.classList.contains(CLASS_NAME_SHOW)
const isActive = this._isShown()
if (isActive) {
this.hide()
@ -139,7 +139,7 @@ class Dropdown extends BaseComponent {
}
show() {
if (isDisabled(this._element) || this._menu.classList.contains(CLASS_NAME_SHOW)) {
if (isDisabled(this._element) || this._isShown(this._menu)) {
return
}
@ -201,7 +201,7 @@ class Dropdown extends BaseComponent {
}
hide() {
if (isDisabled(this._element) || !this._menu.classList.contains(CLASS_NAME_SHOW)) {
if (isDisabled(this._element) || !this._isShown(this._menu)) {
return
}
@ -279,6 +279,10 @@ class Dropdown extends BaseComponent {
return config
}
_isShown(element = this._element) {
return element.classList.contains(CLASS_NAME_SHOW)
}
_getMenuElement() {
return SelectorEngine.next(this._element, SELECTOR_MENU)[0]
}
@ -398,7 +402,7 @@ class Dropdown extends BaseComponent {
continue
}
if (!context._element.classList.contains(CLASS_NAME_SHOW)) {
if (!context._isShown()) {
continue
}