From d230c4ae3b369b872098b7bcc08f2dbb424f98df Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Tue, 1 Dec 2020 20:57:29 +0200 Subject: [PATCH] Remove a few `null` strict checks --- js/src/alert.js | 2 +- js/src/collapse.js | 4 ++-- js/src/tab.js | 2 +- js/src/tooltip.js | 11 ++++++----- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/js/src/alert.js b/js/src/alert.js index 96eda4c5f..7bc3546e5 100644 --- a/js/src/alert.js +++ b/js/src/alert.js @@ -55,7 +55,7 @@ class Alert extends BaseComponent { const rootElement = element ? this._getRootElement(element) : this._element const customEvent = this._triggerCloseEvent(rootElement) - if (customEvent === null || customEvent.defaultPrevented) { + if (!customEvent || customEvent.defaultPrevented) { return } diff --git a/js/src/collapse.js b/js/src/collapse.js index 90bab0ec9..d29adeeb0 100644 --- a/js/src/collapse.js +++ b/js/src/collapse.js @@ -84,7 +84,7 @@ class Collapse extends BaseComponent { const filterElement = SelectorEngine.find(selector) .filter(foundElem => foundElem === element) - if (selector !== null && filterElement.length) { + if (selector && filterElement.length) { this._selector = selector this._triggerArray.push(elem) } @@ -384,7 +384,7 @@ EventHandler.on(document, EVENT_CLICK_DATA_API, SELECTOR_DATA_TOGGLE, function ( let config if (data) { // update parent attribute - if (data._parent === null && typeof triggerData.parent === 'string') { + if (data._parent && typeof triggerData.parent === 'string') { data._config.parent = triggerData.parent data._parent = data._getParent() } diff --git a/js/src/tab.js b/js/src/tab.js index f1b17ac79..5a3479863 100644 --- a/js/src/tab.js +++ b/js/src/tab.js @@ -91,7 +91,7 @@ class Tab extends BaseComponent { relatedTarget: previous }) - if (showEvent.defaultPrevented || (hideEvent !== null && hideEvent.defaultPrevented)) { + if (showEvent.defaultPrevented || (hideEvent && hideEvent.defaultPrevented)) { return } diff --git a/js/src/tooltip.js b/js/src/tooltip.js index 103524b8b..cce16075c 100644 --- a/js/src/tooltip.js +++ b/js/src/tooltip.js @@ -248,9 +248,9 @@ class Tooltip extends BaseComponent { if (this.isWithContent() && this._isEnabled) { const showEvent = EventHandler.trigger(this._element, this.constructor.Event.SHOW) const shadowRoot = findShadowRoot(this._element) - const isInTheDom = shadowRoot === null ? - this._element.ownerDocument.documentElement.contains(this._element) : - shadowRoot.contains(this._element) + const isInTheDom = shadowRoot ? + shadowRoot.contains(this._element) : + this._element.ownerDocument.documentElement.contains(this._element) if (showEvent.defaultPrevented || !isInTheDom) { return @@ -406,7 +406,7 @@ class Tooltip extends BaseComponent { } setElementContent(element, content) { - if (element === null) { + if (!element) { return } @@ -734,7 +734,8 @@ class Tooltip extends BaseComponent { _cleanTipClass() { const tip = this.getTipElement() const tabClass = tip.getAttribute('class').match(BSCLS_PREFIX_REGEX) - if (tabClass !== null && tabClass.length > 0) { + + if (tabClass && tabClass.length > 0) { tabClass.map(token => token.trim()) .forEach(tClass => tip.classList.remove(tClass)) }