Skip to content

Commit 8efd8c2

Browse files
committed
Only load the search results when the search form is submitted for the
first time
1 parent 7ab325e commit 8efd8c2

File tree

3 files changed

+35
-5
lines changed

3 files changed

+35
-5
lines changed

docs_theme/base.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ <h3 id="myModalLabel">Documentation search</h3>
7373
<div class="modal-body">
7474
<form role="form">
7575
<div class="form-group">
76-
<input type="text" class="form-control" placeholder="Search..." id="mkdocs-search-query">
76+
<input type="text" name="q" class="form-control" placeholder="Search..." id="mkdocs-search-query">
7777
</div>
7878
</form>
7979
<div id="mkdocs-search-results"></div>
@@ -167,9 +167,9 @@ <h3 id="myModalLabel">Documentation search</h3>
167167
<script src="{{ base_url }}/js/jquery-1.8.1-min.js"></script>
168168
<script src="{{ base_url }}/js/prettify-1.0.js"></script>
169169
<script src="{{ base_url }}/js/bootstrap-2.1.1-min.js"></script>
170-
<script src="{{ base_url }}/js/theme.js"></script>
171170
<script>var base_url = '{{ base_url }}';</script>
172-
<script data-main="{{ base_url }}/mkdocs/js/search.js" src="{{ base_url }}/mkdocs/js/require.js"></script>
171+
<script src="{{ base_url }}/mkdocs/js/require.js"></script>
172+
<script src="{{ base_url }}/js/theme.js"></script>
173173

174174
<script>
175175
//$('.side-nav').scrollspy()

docs_theme/js/theme.js

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,35 @@
1-
$(function(){
1+
function getSearchTerm()
2+
{
3+
var sPageURL = window.location.search.substring(1);
4+
var sURLVariables = sPageURL.split('&');
5+
for (var i = 0; i < sURLVariables.length; i++)
6+
{
7+
var sParameterName = sURLVariables[i].split('=');
8+
if (sParameterName[0] == 'q')
9+
{
10+
return sParameterName[1];
11+
}
12+
}
13+
}
14+
15+
$(function() {
16+
17+
var initialise_search = function(){
18+
require.config({"baseUrl":"/mkdocs/js"});
19+
require(["search",]);
20+
}
21+
22+
var search_term = getSearchTerm();
23+
if(search_term){
24+
$('#mkdocs_search_modal').modal();
25+
}
226

327
$('pre code').parent().addClass('prettyprint well');
428

29+
$(document).on("submit", "#mkdocs_search_modal form", function (e) {
30+
$("#mkdocs-search-results").html("Searching...")
31+
initialise_search();
32+
return false;
33+
});
34+
535
});

docs_theme/nav.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<a class="repo-link btn btn-inverse btn-small {% if not previous_page %}disabled{% endif %}" rel="next" {% if previous_page %}href="{{ previous_page.url }}"{% endif %}>
99
<i class="icon-arrow-left icon-white"></i> Previous
1010
</a>
11-
<a class="repo-link btn btn-inverse btn-small" href="#mkdocs_search_modal" data-toggle="modal" data-target="#mkdocs_search_modal"><i class="icon-search icon-white"></i> Search</a>
11+
<a id="search_modal_show" class="repo-link btn btn-inverse btn-small" href="#mkdocs_search_modal" data-toggle="modal" data-target="#mkdocs_search_modal"><i class="icon-search icon-white"></i> Search</a>
1212
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
1313
<span class="icon-bar"></span>
1414
<span class="icon-bar"></span>

0 commit comments

Comments
 (0)