Disable ESlint on no-return-assign and temporary for arrow-body-style

diff --git a/.eslintrc.json b/.eslintrc.json
index bfd2d333ae600778776d382cf26447b7dc610747..e0b3e5380ac2525cec5bd5898eff7132f0119d33 100644 (file)
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -69,7 +69,6 @@
     "no-param-reassign": "off",
     "no-proto": "error",
     "no-restricted-properties": "error",
-    "no-return-assign": "error",
     "no-return-await": "error",
     "no-script-url": "error",
     "no-self-compare": "error",

diff --git a/js/src/alert.js b/js/src/alert.js
index c530b2996b4e6e2d435ac76fbc46b2b9fef84015..000d7506f190b5366d19ebacd5ec4f98f317a579 100644 (file)
--- a/js/src/alert.js
+++ b/js/src/alert.js
@@ -66,7 +66,7 @@ class Alert {
 
     const customEvent = this._triggerCloseEvent(rootElement)
 
-    if (customEvent.defaultPrevented) {
+    if (customEvent === null || customEvent.defaultPrevented) {
       return
     }
 

diff --git a/js/src/dom/selectorEngine.js b/js/src/dom/selectorEngine.js
index f6f3fe82f0cc8f215fd0eb45522fc78038be08e8..1c98c15ae114c8f017a5312b985548bfddbe1e95 100644 (file)
--- a/js/src/dom/selectorEngine.js
+++ b/js/src/dom/selectorEngine.js
@@ -16,8 +16,9 @@ if (!Element.prototype.matches) {
 }
 
 // closest polyfill (see: https://mzl.la/2vXggaI)
+let fnClosest = null
 if (!Element.prototype.closest) {
-  Element.prototype.closest = (element, selector) => {
+  fnClosest = (element, selector) => {
     let ancestor = element
     if (!document.documentElement.contains(element)) {
       return null
@@ -33,10 +34,13 @@ if (!Element.prototype.closest) {
 
     return null
   }
+} else {
+  // eslint-disable-next-line arrow-body-style
+  fnClosest = (element, selector) => {
+    return element.closest(selector)
+  }
 }
 
-const fnClosest = Element.prototype.closest
-
 const SelectorEngine = {
   matches(element, selector) {
     return fnMatches.call(element, selector)
@@ -56,7 +60,7 @@ const SelectorEngine = {
   },
 
   closest(element, selector) {
-    return fnClosest.call(element, selector)
+    return fnClosest(element, selector)
   }
 }