aboutsummaryrefslogtreecommitdiff
path: root/js/src
diff options
context:
space:
mode:
authorXhmikosR <[email protected]>2020-05-08 19:19:14 +0300
committerXhmikosR <[email protected]>2020-05-12 19:21:36 +0300
commiteb720f20ff3f49f58ee35b758f4783a3d1e858b2 (patch)
tree994d3668f071c2860d698a145aec0012ac171efa /js/src
parent53eace04dfe5bdb128771f2a765c6824aa5b4bbf (diff)
downloadbootstrap-eb720f20ff3f49f58ee35b758f4783a3d1e858b2.tar.xz
bootstrap-eb720f20ff3f49f58ee35b758f4783a3d1e858b2.zip
Minor lint tweaks and rules cleanup
Diffstat (limited to 'js/src')
-rw-r--r--js/src/dropdown.js1
-rw-r--r--js/src/modal.js1
-rw-r--r--js/src/tools/sanitizer.js4
-rw-r--r--js/src/util.js2
4 files changed, 3 insertions, 5 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
}
}
}