From: Patrick H. Lauke <redux@splintered.co.uk>
Date: Thu, 6 Dec 2018 11:30:12 +0000 (+0000)
Subject: Remove nonsensical boolean check (#27787)
X-Git-Tag: v4.2.0~35
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c70b043a76764b842c732417fb32325ae2d1ac56;p=thirdparty%2Fbootstrap.git

Remove nonsensical boolean check (#27787)

...as it always evaluates to true
---

diff --git a/js/src/dropdown.js b/js/src/dropdown.js
index d8fe5fdba1..0c13b2c5eb 100644
--- a/js/src/dropdown.js
+++ b/js/src/dropdown.js
@@ -468,8 +468,7 @@ class Dropdown {
     const parent   = Dropdown._getParentFromElement(this)
     const isActive = $(parent).hasClass(ClassName.SHOW)
 
-    if (!isActive && (event.which !== ESCAPE_KEYCODE || event.which !== SPACE_KEYCODE) ||
-          isActive && (event.which === ESCAPE_KEYCODE || event.which === SPACE_KEYCODE)) {
+    if (!isActive || isActive && (event.which === ESCAPE_KEYCODE || event.which === SPACE_KEYCODE)) {
       if (event.which === ESCAPE_KEYCODE) {
         const toggle = parent.querySelector(Selector.DATA_TOGGLE)
         $(toggle).trigger('focus')