From 4d101491da094418a768ff2f44be1ca85fd85922 Mon Sep 17 00:00:00 2001 From: Markus Hatvan Date: Thu, 22 Aug 2019 21:17:34 +0200 Subject: Remaining JS linting TODO (#29289) * Enable and fix all occurrences with no-mixed-operators rule * Take care of the max-depth warning in button.js Signed-off-by: mhatvan --- js/src/dropdown/dropdown.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'js/src/dropdown') diff --git a/js/src/dropdown/dropdown.js b/js/src/dropdown/dropdown.js index fc51f443c..d3797b65c 100644 --- a/js/src/dropdown/dropdown.js +++ b/js/src/dropdown/dropdown.js @@ -390,7 +390,7 @@ class Dropdown { static clearMenus(event) { if (event && (event.which === RIGHT_MOUSE_BUTTON_WHICH || - event.type === 'keyup' && event.which !== TAB_KEYCODE)) { + (event.type === 'keyup' && event.which !== TAB_KEYCODE))) { return } @@ -415,9 +415,9 @@ class Dropdown { continue } - if (event && (event.type === 'click' && - /input|textarea/i.test(event.target.tagName) || - event.type === 'keyup' && event.which === TAB_KEYCODE) && + if (event && ((event.type === 'click' && + /input|textarea/i.test(event.target.tagName)) || + (event.type === 'keyup' && event.which === TAB_KEYCODE)) && parent.contains(event.target)) { continue } @@ -459,9 +459,9 @@ class Dropdown { // - If key is not up or down => not a dropdown command // - If trigger inside the menu => not a dropdown command if (/input|textarea/i.test(event.target.tagName) ? - event.which === SPACE_KEYCODE || event.which !== ESCAPE_KEYCODE && - (event.which !== ARROW_DOWN_KEYCODE && event.which !== ARROW_UP_KEYCODE || - SelectorEngine.closest(event.target, Selector.MENU)) : + event.which === SPACE_KEYCODE || (event.which !== ESCAPE_KEYCODE && + ((event.which !== ARROW_DOWN_KEYCODE && event.which !== ARROW_UP_KEYCODE) || + SelectorEngine.closest(event.target, Selector.MENU))) : !REGEXP_KEYDOWN.test(event.which)) { return } @@ -476,7 +476,7 @@ class Dropdown { const parent = Dropdown.getParentFromElement(this) const isActive = parent.classList.contains(ClassName.SHOW) - if (!isActive || 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) { SelectorEngine.findOne(Selector.DATA_TOGGLE, parent).focus() } -- cgit v1.2.3