Browse code

as we're not using the search suggestion feature only load the search_content when we have a search ?q= param

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)

Sven Dowideit authored on 2015/01/26 20:44:17
Showing 2 changed files
... ...
@@ -90,7 +90,6 @@ upload_current_documentation() {
90 90
 	echo "Uploading $src"
91 91
 	echo "  to $dst"
92 92
 	echo
93
-	#s3cmd --recursive --follow-symlinks --preserve --acl-public sync "$src" "$dst"
94 93
 
95 94
 	# a really complicated way to send only the files we want
96 95
 	# if there are too many in any one set, aws s3 sync seems to fall over with 2 files to go
... ...
@@ -104,7 +103,7 @@ upload_current_documentation() {
104 104
 		$run
105 105
 
106 106
 	# Make sure the search_content.json.gz file has the right content-encoding
107
-	aws s3 cp --profile $BUCKET --cache-control "max-age=3600" --content-encoding="gzip" --acl public-read "site/search_content.json.gz" "$dst"
107
+	aws s3 cp --profile $BUCKET --cache-control $cache --content-encoding="gzip" --acl public-read "site/search_content.json.gz" "$dst"
108 108
 }
109 109
 
110 110
 invalidate_cache() {
... ...
@@ -45,11 +45,17 @@ $(document).ready(function ()
45 45
     },
46 46
   });
47 47
 
48
-  // Tipue Search activation
49
-  $('#tipue_search_input').tipuesearch({
50
-    'mode': 'json',
51
-    'contentLocation': '/search_content.json.gz'
52
-  });
48
+  function getURLP(name)
49
+  {
50
+    return decodeURIComponent((new RegExp('[?|&]' + name + '=' + '([^&;]+?)(&|#|;|$)').exec(location.search)||[,""])[1].replace(/\+/g, '%20')) || null;
51
+  }
52
+  if (getURLP("q")) {
53
+    // Tipue Search activation
54
+    $('#tipue_search_input').tipuesearch({
55
+      'mode': 'json',
56
+      'contentLocation': '/search_content.json.gz'
57
+    });
58
+  }
53 59
 
54 60
 });
55 61