From 5d1da6377df993319c77d6133eafd09a1c956990 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Tue, 24 Dec 2019 18:23:17 +0200 Subject: [PATCH] Fix the new lint errors. --- build/change-version.js | 4 ++-- js/src/util/sanitizer.js | 4 ++-- site/assets/js/application.js | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build/change-version.js b/build/change-version.js index d6fcbfc5a9..0c4f3ef353 100755 --- a/build/change-version.js +++ b/build/change-version.js @@ -17,11 +17,11 @@ sh.config.fatal = true // Blame TC39... https://github.com/benjamingr/RegExp.escape/issues/37 function regExpQuote(string) { - return string.replace(/[-\\^$*+?.()|[\]{}]/g, '\\$&') + return string.replace(/[$()*+-.?[\\\]^{|}]/g, '\\$&') } function regExpQuoteReplacement(string) { - return string.replace(/[$]/g, '$$') + return string.replace(/\$/g, '$$') } const DRY_RUN = false diff --git a/js/src/util/sanitizer.js b/js/src/util/sanitizer.js index 8f72d2005a..58caeb4864 100644 --- a/js/src/util/sanitizer.js +++ b/js/src/util/sanitizer.js @@ -25,14 +25,14 @@ const ARIA_ATTRIBUTE_PATTERN = /^aria-[\w-]*$/i * * 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 const allowedAttribute = (attr, allowedAttributeList) => { const attrName = attr.nodeName.toLowerCase() diff --git a/site/assets/js/application.js b/site/assets/js/application.js index 31679f11b3..0cf4199c96 100644 --- a/site/assets/js/application.js +++ b/site/assets/js/application.js @@ -152,7 +152,7 @@ }) clipboard.on('error', function (e) { - var modifierKey = /Mac/i.test(navigator.userAgent) ? '\u2318' : 'Ctrl-' + var modifierKey = /mac/i.test(navigator.userAgent) ? '\u2318' : 'Ctrl-' var fallbackMsg = 'Press ' + modifierKey + 'C to copy' var tooltipBtn = bootstrap.Tooltip.getInstance(e.trigger)