Minor lint tweaks and rules cleanup

8 files changed, 3 insertions, 9 deletions

diff --git a/js/src/dropdown.js b/js/src/dropdown.js
index 767fa5207..d32fc74af 100644
--- a/js/src/dropdown.js
+++ b/js/src/dropdown.js
@@ -531,5 +531,4 @@ $.fn[NAME].noConflict = () => {
   return Dropdown._jQueryInterface
 }
 
-
 export default Dropdown
diff --git a/js/src/modal.js b/js/src/modal.js
index 6b80bb2f0..5dc7cd393 100644
--- a/js/src/modal.js
+++ b/js/src/modal.js
@@ -179,7 +179,6 @@ class Modal {
     $(this._element).off(EVENT_CLICK_DISMISS)
     $(this._dialog).off(EVENT_MOUSEDOWN_DISMISS)
 
-
     if (transition) {
       const transitionDuration  = Util.getTransitionDurationFromElement(this._element)
 
diff --git a/js/src/tools/sanitizer.js b/js/src/tools/sanitizer.js
index f108c66d5..0c3d4813b 100644
--- a/js/src/tools/sanitizer.js
+++ b/js/src/tools/sanitizer.js
@@ -57,14 +57,14 @@ export const DefaultWhitelist = {
  *
  * Shoutout to Angular 7 https://github.com/angular/angular/blob/7.2.4/packages/core/src/sanitization/url_sanitizer.ts
  */
-const SAFE_URL_PATTERN = /^(?:(?:https?|mailto|ftp|tel|file):|[^&:/?#]*(?:[/?#]|$))/gi
+const SAFE_URL_PATTERN = /^(?:(?:https?|mailto|ftp|tel|file):|[^#&/:?]*(?:[#/?]|$))/gi
 
 /**
  * A pattern that matches safe data URLs. Only matches image, video and audio types.
  *
  * Shoutout to Angular 7 https://github.com/angular/angular/blob/7.2.4/packages/core/src/sanitization/url_sanitizer.ts
  */
-const DATA_URL_PATTERN = /^data:(?:image\/(?:bmp|gif|jpeg|jpg|png|tiff|webp)|video\/(?:mpeg|mp4|ogg|webm)|audio\/(?:mp3|oga|ogg|opus));base64,[a-z0-9+/]+=*$/i
+const DATA_URL_PATTERN = /^data:(?:image\/(?:bmp|gif|jpeg|jpg|png|tiff|webp)|video\/(?:mpeg|mp4|ogg|webm)|audio\/(?:mp3|oga|ogg|opus));base64,[\d+/a-z]+=*$/i
 
 function allowedAttribute(attr, allowedAttributeList) {
   const attrName = attr.nodeName.toLowerCase()
diff --git a/js/src/util.js b/js/src/util.js
index 802e574e5..c8168c475 100644
--- a/js/src/util.js
+++ b/js/src/util.js
@@ -34,7 +34,7 @@ function getSpecialTransitionEndEvent() {
       if ($(event.target).is(this)) {
         return event.handleObj.handler.apply(this, arguments) // eslint-disable-line prefer-rest-params
       }
-      return undefined // eslint-disable-line no-undefined
+      return undefined
     }
   }
 }
diff --git a/js/tests/karma.conf.js b/js/tests/karma.conf.js
index aacafe3d3..fc3c7703b 100644
--- a/js/tests/karma.conf.js
+++ b/js/tests/karma.conf.js
@@ -1,5 +1,4 @@
 /* eslint-env node */
-/* eslint no-process-env: 0 */
 
 const path = require('path')
 const ip = require('ip')
diff --git a/js/tests/unit/modal.js b/js/tests/unit/modal.js
index 95c334032..71229a79c 100644
--- a/js/tests/unit/modal.js
+++ b/js/tests/unit/modal.js
@@ -826,7 +826,6 @@ $(function () {
       '</div>'
     ].join('')).appendTo('#qunit-fixture')
 
-
     $modal.on('shown.bs.modal', function () {
       assert.strictEqual($modal.scrollTop(), 0)
       done()
diff --git a/js/tests/unit/toast.js b/js/tests/unit/toast.js
index 3b5da05f3..89bcaf9b6 100644
--- a/js/tests/unit/toast.js
+++ b/js/tests/unit/toast.js
@@ -208,7 +208,6 @@ $(function () {
       .bootstrapToast('show')
   })
 
-
   QUnit.test('should close toast when close element with data-dismiss attribute is set', function (assert) {
     assert.expect(2)
     var done = assert.async()
diff --git a/js/tests/unit/util.js b/js/tests/unit/util.js
index 20c1e6ba3..887bad3f8 100644
--- a/js/tests/unit/util.js
+++ b/js/tests/unit/util.js
@@ -63,7 +63,6 @@ $(function () {
 
     Util.typeCheckConfig(namePlugin, config, defaultType)
 
-    // eslint-disable-next-line
     config.toggle = undefined
 
     Util.typeCheckConfig(namePlugin, config, defaultType)