More

twbs · Nov 16, 2021 · c48f6e4 · c48f6e4
1 parent 41a562a
commit c48f6e4
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/js/src/carousel.js b/js/src/carousel.js
@@ -278,7 +278,7 @@ class Carousel extends BaseComponent {
   }
 
   _getItemIndex(element) {
-    this._items = element && element.parentNode ?
+    this._items = element?.parentNode ?
       SelectorEngine.find(SELECTOR_ITEM, element.parentNode) :
       []
 
@@ -354,7 +354,7 @@ class Carousel extends BaseComponent {
     const orderClassName = isNext ? CLASS_NAME_NEXT : CLASS_NAME_PREV
     const eventDirectionName = this._orderToDirection(order)
 
-    if (nextElement && nextElement.classList.contains(CLASS_NAME_ACTIVE)) {
+    if (nextElement?.classList.contains(CLASS_NAME_ACTIVE)) {
       this._isSliding = false
       return
     }

diff --git a/js/src/collapse.js b/js/src/collapse.js
@@ -284,7 +284,7 @@ class Collapse extends BaseComponent {
 
 EventHandler.on(document, EVENT_CLICK_DATA_API, SELECTOR_DATA_TOGGLE, function (event) {
   // preventDefault only for <a> elements (which change the URL) not inside the collapsible element
-  if (event.target.tagName === 'A' || (event.delegateTarget && event.delegateTarget.tagName === 'A')) {
+  if (event.target.tagName === 'A' || event.delegateTarget?.tagName === 'A') {
     event.preventDefault()
   }
 

diff --git a/js/src/dom/selector-engine.js b/js/src/dom/selector-engine.js
@@ -30,7 +30,7 @@ const SelectorEngine = {
     const parents = []
     let ancestor = element.parentNode
 
-    while (ancestor && ancestor.nodeType === Node.ELEMENT_NODE && ancestor.nodeType !== NODE_TEXT) {
+    while (ancestor?.nodeType === Node.ELEMENT_NODE && ancestor?.nodeType !== NODE_TEXT) {
       if (ancestor.matches(selector)) {
         parents.push(ancestor)
       }

diff --git a/js/src/dropdown.js b/js/src/dropdown.js
@@ -363,7 +363,7 @@ class Dropdown extends BaseComponent {
   }
 
   static clearMenus(event) {
-    if (event && (event.button === RIGHT_MOUSE_BUTTON || (event.type === 'keyup' && event.key !== TAB_KEY))) {
+    if (event?.button === RIGHT_MOUSE_BUTTON || (event?.type === 'keyup' && event?.key !== TAB_KEY)) {
       return
     }
 

diff --git a/js/src/tab.js b/js/src/tab.js
@@ -102,7 +102,7 @@ class Tab extends BaseComponent {
       SelectorEngine.children(container, SELECTOR_ACTIVE)
 
     const active = activeElements[0]
-    const isTransitioning = callback && (active && active.classList.contains(CLASS_NAME_FADE))
+    const isTransitioning = callback && (active?.classList.contains(CLASS_NAME_FADE))
 
     const complete = () => this._transitionComplete(element, active, callback)
 
@@ -141,11 +141,11 @@ class Tab extends BaseComponent {
     }
 
     let parent = element.parentNode
-    if (parent && parent.nodeName === 'LI') {
+    if (parent?.nodeName === 'LI') {
       parent = parent.parentNode
     }
 
-    if (parent && parent.classList.contains(CLASS_NAME_DROPDOWN_MENU)) {
+    if (parent?.classList.contains(CLASS_NAME_DROPDOWN_MENU)) {
       const dropdownElement = element.closest(SELECTOR_DROPDOWN)
 
       if (dropdownElement) {

diff --git a/js/src/util/swipe.js b/js/src/util/swipe.js
@@ -82,7 +82,7 @@ class Swipe {
   }
 
   _move(event) {
-    this._deltaX = event.touches && event.touches.length > 1 ?
+    this._deltaX = event.touches?.length > 1 ?
       0 :
       event.touches[0].clientX - this._deltaX
   }