]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Remove nonsensical boolean check (#27787)
authorPatrick H. Lauke <redux@splintered.co.uk>
Thu, 6 Dec 2018 11:30:12 +0000 (11:30 +0000)
committerXhmikosR <xhmikosr@gmail.com>
Thu, 6 Dec 2018 11:30:12 +0000 (13:30 +0200)
...as it always evaluates to true

js/src/dropdown.js

index d8fe5fdba1dfd74b1ddaf4384e7fbcbe050c58a1..0c13b2c5eb5db1e0c47bf1bd0873d8284f598e59 100644 (file)
@@ -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')