Skip to content

search.js: make the check for URL stricter #30695

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
XhmikosR merged 5 commits into from
Apr 30, 2020
Merged

search.js: make the check for URL stricter #30695

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0fa9cf3
search.js: make the check for URL stricter
XhmikosR Apr 30, 2020
2cc38ba
Solution with `lastIndexOf`
XhmikosR Apr 30, 2020
05568d0
Update search.js
XhmikosR Apr 30, 2020
3a5746c
Merge branch 'master' into master-xmr-docs-search-url
XhmikosR Apr 30, 2020
fd6899c
Update search.js
XhmikosR Apr 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions site/assets/js/search.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,14 @@
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') {
Expand Down