diff options
| author | XhmikosR <[email protected]> | 2018-03-14 19:44:32 +0200 |
|---|---|---|
| committer | XhmikosR <[email protected]> | 2018-03-14 21:06:17 +0200 |
| commit | b9577a1cf7277b7e7854c3b4ea009e2fed6ea242 (patch) | |
| tree | 59dc10a85c4f1af1d8e872d0c385f05db313d3e8 | |
| parent | 483e49e3c6784f4afbc9982c3498151f6f97ee30 (diff) | |
| download | bootstrap-b9577a1cf7277b7e7854c3b4ea009e2fed6ea242.tar.xz bootstrap-b9577a1cf7277b7e7854c3b4ea009e2fed6ea242.zip | |
Alternative solution.
Rely on `site.url` which is different for production. In that case do nothing with the search result, otherwise when in development remove our url from it.
| -rw-r--r-- | _includes/docs-sidebar.html | 2 | ||||
| -rw-r--r-- | assets/js/src/application.js | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/_includes/docs-sidebar.html b/_includes/docs-sidebar.html index 3e82a8b21..c0a0982bc 100644 --- a/_includes/docs-sidebar.html +++ b/_includes/docs-sidebar.html @@ -1,5 +1,5 @@ <form class="bd-search d-flex align-items-center"> - <input type="search" class="form-control" id="search-input" placeholder="Search..." aria-label="Search for..." autocomplete="off" data-baseurl="{{ site.baseurl }}/docs/{{ site.docs_version }}"> + <input type="search" class="form-control" id="search-input" placeholder="Search..." aria-label="Search for..." autocomplete="off" data-siteurl="{{ site.url }}"> <button class="btn btn-link bd-search-docs-toggle d-md-none p-0 ml-3" type="button" data-toggle="collapse" data-target="#bd-docs-nav" aria-controls="bd-docs-nav" aria-expanded="false" aria-label="Toggle docs navigation"> {%- include icons/menu.svg width="30" height="30" -%} </button> diff --git a/assets/js/src/application.js b/assets/js/src/application.js index 2d8b08d1d..a35202f1d 100644 --- a/assets/js/src/application.js +++ b/assets/js/src/application.js @@ -115,8 +115,13 @@ }, transformData: function (hits) { return hits.map(function (hit) { - var baseurl = document.getElementById('search-input').getAttribute('data-baseurl') - hit.url = hit.url.replace('https://getbootstrap.com' + baseurl, baseurl) + // When in production, return the result as is, + // otherwise remove our url from it. + var siteurl = document.getElementById('search-input').getAttribute('data-siteurl') + var urlRE = /^https?:\/\/getbootstrap\.com/ + + hit.url = siteurl.match(urlRE) ? hit.url : hit.url.replace(urlRE, '') + return hit }) }, |