Skip to content

Commit 3c629e7

Browse files
committed
Use search_index_path helper to locate Search assets
This fixes search when Middleman is configured with the http_prefix option. This is the recommended approach from the Middleman search gem itself, rather than hardcoding '/search.json' References: - https://github.com/manastech/middleman-search#asset-pipeline - https://github.com/manastech/middleman-search/blob/ed9e5254bb554988c755fc40238d9e9f67b20abe/lib/middleman-search/extension.rb#L29
1 parent 6f84654 commit 3c629e7

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

lib/assets/javascripts/_modules/search.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
var results
1717
var query
1818
var maxSearchEntries = 20
19+
var searchIndexPath
1920

2021
this.start = function start ($element) {
2122
$searchForm = $element.find('form')
@@ -25,6 +26,7 @@
2526
$searchResults = $searchResultsWrapper.find('.search-results__content')
2627
$searchResultsTitle = $searchResultsWrapper.find('.search-results__title')
2728
$searchHelp = $('#search-help')
29+
searchIndexPath = $element.data('searchIndexPath')
2830

2931
changeSearchAction()
3032
changeSearchLabel()
@@ -49,7 +51,7 @@
4951
this.downloadSearchIndex = function downloadSearchIndex () {
5052
updateTitle('Loading search results')
5153
$.ajax({
52-
url: '/search.json',
54+
url: searchIndexPath,
5355
cache: true,
5456
method: 'GET',
5557
success: function (data) {

lib/source/layouts/_search.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<% if config[:tech_docs][:enable_search] %>
2-
<div class="search" data-module="search">
2+
<div class="search" data-module="search" data-search-index-path="<%= search_index_path %>">
33
<form action="https://www.google.co.uk/search" method="get" role="search" class="search__form govuk-!-margin-bottom-4">
44
<input type="hidden" name="as_sitesearch" value="<%= config[:tech_docs][:host] %>"/>
55
<label class="govuk-label search__label" for="search" aria-hidden="true">

0 commit comments

Comments
 (0)