Explorar o código

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 %!s(int64=10) %!d(string=hai) anos
pai
achega
60089ace48
Modificáronse 2 ficheiros con 12 adicións e 7 borrados
  1. 1 2
      docs/release.sh
  2. 11 5
      docs/theme/mkdocs/js/base.js

+ 1 - 2
docs/release.sh

@@ -90,7 +90,6 @@ upload_current_documentation() {
 	echo "Uploading $src"
 	echo "  to $dst"
 	echo
-	#s3cmd --recursive --follow-symlinks --preserve --acl-public sync "$src" "$dst"
 
 	# a really complicated way to send only the files we want
 	# 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() {
 		$run
 
 	# Make sure the search_content.json.gz file has the right content-encoding
-	aws s3 cp --profile $BUCKET --cache-control "max-age=3600" --content-encoding="gzip" --acl public-read "site/search_content.json.gz" "$dst"
+	aws s3 cp --profile $BUCKET --cache-control $cache --content-encoding="gzip" --acl public-read "site/search_content.json.gz" "$dst"
 }
 
 invalidate_cache() {

+ 11 - 5
docs/theme/mkdocs/js/base.js

@@ -45,11 +45,17 @@ $(document).ready(function ()
     },
   });
 
-  // Tipue Search activation
-  $('#tipue_search_input').tipuesearch({
-    'mode': 'json',
-    'contentLocation': '/search_content.json.gz'
-  });
+  function getURLP(name)
+  {
+    return decodeURIComponent((new RegExp('[?|&]' + name + '=' + '([^&;]+?)(&|#|;|$)').exec(location.search)||[,""])[1].replace(/\+/g, '%20')) || null;
+  }
+  if (getURLP("q")) {
+    // Tipue Search activation
+    $('#tipue_search_input').tipuesearch({
+      'mode': 'json',
+      'contentLocation': '/search_content.json.gz'
+    });
+  }
 
 });