]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
search.js: make the check for URL stricter (#30695)
authorXhmikosR <xhmikosr@gmail.com>
Thu, 30 Apr 2020 18:07:26 +0000 (21:07 +0300)
committerGitHub <noreply@github.com>
Thu, 30 Apr 2020 18:07:26 +0000 (21:07 +0300)
site/assets/js/search.js

index ab57ad2f0030581ba1ae5d09793fbacfb762ebef..bb97c5cf80c1504c9543e1722aa0cf5d0e80dd18 100644 (file)
     transformData: function (hits) {
       return hits.map(function (hit) {
         var currentUrl = getOrigin()
-        var liveUrl = 'https://getbootstrap.com'
+        var liveUrl = 'https://getbootstrap.com/'
 
-        // When in production, return the result as is,
-        // otherwise remove our url from it.
-        // eslint-disable-next-line no-negated-condition
-        hit.url = currentUrl.indexOf(liveUrl) !== -1 ? // lgtm [js/incomplete-url-substring-sanitization]
+        hit.url = currentUrl.lastIndexOf(liveUrl, 0) === 0 ?
+          // On production, return the result as is
           hit.url :
-          hit.url.replace(liveUrl, '')
+          // On development or Netlify, replace `hit.url` with a trailing slash,
+          // so that the result link is relative to the server root
+          hit.url.replace(liveUrl, '/')
 
         // Prevent jumping to first header
         if (hit.anchor === 'content') {