mirror of
https://github.com/Hopiu/bootstrap.git
synced 2026-04-25 06:24:43 +00:00
Add isShown method and reuse it
This commit is contained in:
parent
da2db218ed
commit
d3c6f25fd0
1 changed files with 10 additions and 6 deletions
|
|
@ -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
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue