From 8ace80c287214a37e67b1c6d6926ae35d0e64a61 Mon Sep 17 00:00:00 2001
From: Dougal Matthews <dougal@redhat.com>
Date: Thu, 23 Apr 2015 22:18:35 +0100
Subject: [PATCH] Only load the search results when the search form is
 submitted for the first time

---
 docs_theme/base.html   |  6 +++---
 docs_theme/js/theme.js | 32 +++++++++++++++++++++++++++++++-
 docs_theme/nav.html    |  2 +-
 3 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/docs_theme/base.html b/docs_theme/base.html
index b1beecba1..4ec726b0a 100644
--- a/docs_theme/base.html
+++ b/docs_theme/base.html
@@ -73,7 +73,7 @@
           <div class="modal-body">
             <form role="form">
               <div class="form-group">
-                <input type="text" class="form-control" placeholder="Search..." id="mkdocs-search-query">
+                <input type="text" name="q" class="form-control" placeholder="Search..." id="mkdocs-search-query">
               </div>
             </form>
             <div id="mkdocs-search-results"></div>
@@ -167,9 +167,9 @@
   <script src="{{ base_url }}/js/jquery-1.8.1-min.js"></script>
   <script src="{{ base_url }}/js/prettify-1.0.js"></script>
   <script src="{{ base_url }}/js/bootstrap-2.1.1-min.js"></script>
-  <script src="{{ base_url }}/js/theme.js"></script>
   <script>var base_url = '{{ base_url }}';</script>
-  <script data-main="{{ base_url }}/mkdocs/js/search.js" src="{{ base_url }}/mkdocs/js/require.js"></script>
+  <script src="{{ base_url }}/mkdocs/js/require.js"></script>
+  <script src="{{ base_url }}/js/theme.js"></script>
 
   <script>
     //$('.side-nav').scrollspy()
diff --git a/docs_theme/js/theme.js b/docs_theme/js/theme.js
index 73607be5e..6d5380693 100644
--- a/docs_theme/js/theme.js
+++ b/docs_theme/js/theme.js
@@ -1,5 +1,35 @@
-$(function(){
+function getSearchTerm()
+{
+    var sPageURL = window.location.search.substring(1);
+    var sURLVariables = sPageURL.split('&');
+    for (var i = 0; i < sURLVariables.length; i++)
+    {
+        var sParameterName = sURLVariables[i].split('=');
+        if (sParameterName[0] == 'q')
+        {
+            return sParameterName[1];
+        }
+    }
+}
+
+$(function() {
+
+    var initialise_search = function(){
+        require.config({"baseUrl":"/mkdocs/js"});
+        require(["search",]);
+    }
+
+    var search_term = getSearchTerm();
+    if(search_term){
+        $('#mkdocs_search_modal').modal();
+    }
 
     $('pre code').parent().addClass('prettyprint well');
 
+    $(document).on("submit", "#mkdocs_search_modal form", function (e) {
+        $("#mkdocs-search-results").html("Searching...")
+        initialise_search();
+        return false;
+    });
+
 });
diff --git a/docs_theme/nav.html b/docs_theme/nav.html
index e6f6dc5ce..7fb42ee8e 100644
--- a/docs_theme/nav.html
+++ b/docs_theme/nav.html
@@ -8,7 +8,7 @@
           <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 %}>
             <i class="icon-arrow-left icon-white"></i> Previous
           </a>
-          <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>
+          <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>
           <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>