From: GeoSot <geo.sotis@gmail.com>
Date: Thu, 10 Jun 2021 14:51:01 +0000 (+0300)
Subject: Add `isShown` method and reuse it
X-Git-Tag: v5.1.0~59
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d3c6f25fd0cc811a681f3a6b88708c04b2c9b797;p=thirdparty%2Fbootstrap.git

Add `isShown` method and reuse it
---

diff --git a/js/src/dropdown.js b/js/src/dropdown.js
index 681369b484..d9bd903c18 100644
--- a/js/src/dropdown.js
+++ b/js/src/dropdown.js
@@ -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
       }