]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Fix the new lint errors.
authorXhmikosR <xhmikosr@gmail.com>
Tue, 24 Dec 2019 16:23:17 +0000 (18:23 +0200)
committerXhmikosR <xhmikosr@gmail.com>
Tue, 7 Jan 2020 20:25:50 +0000 (22:25 +0200)
build/change-version.js
js/src/util/sanitizer.js
site/assets/js/application.js

index d6fcbfc5a9e12eaba855b2701d219bce23c34b41..0c4f3ef353ae1809d4151d2d6bbca9f53c43d911 100755 (executable)
@@ -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
index 8f72d2005af03c7651d7f59de4974bc0b092f45a..58caeb4864baacd5edae2e72f93e65234113e0fe 100644 (file)
@@ -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()
index 31679f11b363e7570a62ac12a1f76623ad925d96..0cf4199c96590ab55771f8460267991914163b0d 100644 (file)
   })
 
   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)