Resolve conflicts, add swipe, add @doc

twbs · Oct 13, 2021 · dd315ad · dd315ad
1 parent a9baa30
commit dd315ad
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/js/src/dom/selector-engine.js b/js/src/dom/selector-engine.js
@@ -5,7 +5,7 @@
  * --------------------------------------------------------------------------
  */
 
-import { isDisabled, isVisible } from '../util/index'
+import { getDocument, isDisabled, isVisible } from '../util/index'
 
 /**
  * Constants

diff --git a/js/src/util/index.js b/js/src/util/index.js
@@ -310,10 +310,16 @@ const getNextActiveElement = (list, activeElement, shouldGetNext, isCycleAllowed
   return list[Math.max(0, Math.min(index, listLength - 1))]
 }
 
+/**
+ * @return {window|{}} The proper element
+ */
 const getWindow = () => {
   return typeof window === 'undefined' ? {} : window
 }
 
+/**
+ * @return {document|{}} The proper element
+ */
 const getDocument = () => {
   return typeof document === 'undefined' ? {} : document
 }

diff --git a/js/src/util/swipe.js b/js/src/util/swipe.js
@@ -6,7 +6,7 @@
  */
 
 import EventHandler from '../dom/event-handler'
-import { execute, typeCheckConfig } from './index'
+import { execute, getDocument, getWindow, typeCheckConfig } from './index'
 
 /**
  * Constants
@@ -50,7 +50,7 @@ class Swipe {
 
     this._config = this._getConfig(config)
     this._deltaX = 0
-    this._supportPointerEvents = Boolean(window.PointerEvent)
+    this._supportPointerEvents = Boolean(getWindow().PointerEvent)
     this._initEvents()
   }
 
@@ -133,7 +133,7 @@ class Swipe {
 
   // Static
   static isSupported() {
-    return 'ontouchstart' in document.documentElement || navigator.maxTouchPoints > 0
+    return 'ontouchstart' in getDocument().documentElement || navigator.maxTouchPoints > 0
   }
 }