Fix searchdata.bin download url in nested pages

mosra · Jun 27, 2020 · d7e05ce · d7e05ce
1 parent 34c32ce
commit d7e05ce
Show file tree

Hide file tree

Showing 12 changed files with 32 additions and 11 deletions.
diff --git a/documentation/templates/python/base.html b/documentation/templates/python/base.html
@@ -135,7 +135,7 @@
 {% endif %}
 {% if SEARCH_DOWNLOAD_BINARY %}
 <script>
-  Search.download({% if SEARCH_DOWNLOAD_BINARY is string %}'{{ SEARCH_DOWNLOAD_BINARY.format(SEARCHDATA_FORMAT_VERSION)|format_url|e }}'{% else %}window.location.pathname.substr(0, window.location.pathname.lastIndexOf('/') + 1) + 'searchdata-v{{ SEARCHDATA_FORMAT_VERSION }}.bin'{% endif %});
+  Search.download({% if SEARCH_DOWNLOAD_BINARY is string %}'{{ SEARCH_DOWNLOAD_BINARY.format(SEARCHDATA_FORMAT_VERSION)|format_url|e }}'{% else %}window.location.pathname.substr(0, window.location.pathname.lastIndexOf('/') + 1) {% if site_root %} + '{{site_root}}' {% endif %} + 'searchdata-v{{ SEARCHDATA_FORMAT_VERSION }}.bin'{% endif %});
 </script>
 {% else %}
 <script src="{{ 'searchdata-v{}.js'.format(SEARCHDATA_FORMAT_VERSION)|format_url|e }}" async="async"></script>

diff --git a/documentation/test_python/page_nested/classes.html b/documentation/test_python/page_nested/classes.html
@@ -94,6 +94,8 @@ <h1>Classes</h2>
   </div>
 </div>
 <script src="search-v1.js"></script>
-<script src="searchdata-v1.js" async="async"></script>
+<script>
+  Search.download(window.location.pathname.substr(0, window.location.pathname.lastIndexOf('/') + 1)  + 'searchdata-v1.bin');
+</script>
 </body>
 </html>
diff --git a/documentation/test_python/page_nested/examples/advanced/barz.html b/documentation/test_python/page_nested/examples/advanced/barz.html
@@ -80,6 +80,8 @@ <h1>
 </div>
 <script src="../../search-v1.js"></script>
 <script> Search.siteRoot = "../../"; </script>
-<script src="../../searchdata-v1.js" async="async"></script>
+<script>
+  Search.download(window.location.pathname.substr(0, window.location.pathname.lastIndexOf('/') + 1)  + '../../'  + 'searchdata-v1.bin');
+</script>
 </body>
 </html>
diff --git a/documentation/test_python/page_nested/examples/advanced/fooz.html b/documentation/test_python/page_nested/examples/advanced/fooz.html
@@ -80,6 +80,8 @@ <h1>
 </div>
 <script src="../../search-v1.js"></script>
 <script> Search.siteRoot = "../../"; </script>
-<script src="../../searchdata-v1.js" async="async"></script>
+<script>
+  Search.download(window.location.pathname.substr(0, window.location.pathname.lastIndexOf('/') + 1)  + '../../'  + 'searchdata-v1.bin');
+</script>
 </body>
 </html>
diff --git a/documentation/test_python/page_nested/examples/advanced/index.html b/documentation/test_python/page_nested/examples/advanced/index.html
@@ -84,6 +84,8 @@ <h1>
 </div>
 <script src="../../search-v1.js"></script>
 <script> Search.siteRoot = "../../"; </script>
-<script src="../../searchdata-v1.js" async="async"></script>
+<script>
+  Search.download(window.location.pathname.substr(0, window.location.pathname.lastIndexOf('/') + 1)  + '../../'  + 'searchdata-v1.bin');
+</script>
 </body>
 </html>
diff --git a/documentation/test_python/page_nested/examples/bar.html b/documentation/test_python/page_nested/examples/bar.html
@@ -80,6 +80,8 @@ <h1>
 </div>
 <script src="../search-v1.js"></script>
 <script> Search.siteRoot = "../"; </script>
-<script src="../searchdata-v1.js" async="async"></script>
+<script>
+  Search.download(window.location.pathname.substr(0, window.location.pathname.lastIndexOf('/') + 1)  + '../'  + 'searchdata-v1.bin');
+</script>
 </body>
 </html>
diff --git a/documentation/test_python/page_nested/examples/foo.html b/documentation/test_python/page_nested/examples/foo.html
@@ -80,6 +80,8 @@ <h1>
 </div>
 <script src="../search-v1.js"></script>
 <script> Search.siteRoot = "../"; </script>
-<script src="../searchdata-v1.js" async="async"></script>
+<script>
+  Search.download(window.location.pathname.substr(0, window.location.pathname.lastIndexOf('/') + 1)  + '../'  + 'searchdata-v1.bin');
+</script>
 </body>
 </html>
diff --git a/documentation/test_python/page_nested/examples/index.html b/documentation/test_python/page_nested/examples/index.html
@@ -90,6 +90,8 @@ <h2>Advanced</h2>
 </div>
 <script src="../search-v1.js"></script>
 <script> Search.siteRoot = "../"; </script>
-<script src="../searchdata-v1.js" async="async"></script>
+<script>
+  Search.download(window.location.pathname.substr(0, window.location.pathname.lastIndexOf('/') + 1)  + '../'  + 'searchdata-v1.bin');
+</script>
 </body>
 </html>
diff --git a/documentation/test_python/page_nested/index.html b/documentation/test_python/page_nested/index.html
@@ -80,6 +80,8 @@ <h1>
   </div>
 </div>
 <script src="search-v1.js"></script>
-<script src="searchdata-v1.js" async="async"></script>
+<script>
+  Search.download(window.location.pathname.substr(0, window.location.pathname.lastIndexOf('/') + 1)  + 'searchdata-v1.bin');
+</script>
 </body>
 </html>
diff --git a/documentation/test_python/page_nested/modules.html b/documentation/test_python/page_nested/modules.html
@@ -94,6 +94,8 @@ <h1>Modules</h2>
   </div>
 </div>
 <script src="search-v1.js"></script>
-<script src="searchdata-v1.js" async="async"></script>
+<script>
+  Search.download(window.location.pathname.substr(0, window.location.pathname.lastIndexOf('/') + 1)  + 'searchdata-v1.bin');
+</script>
 </body>
 </html>
diff --git a/documentation/test_python/page_nested/pages.html b/documentation/test_python/page_nested/pages.html
@@ -100,6 +100,8 @@ <h1>Pages</h2>
   </div>
 </div>
 <script src="search-v1.js"></script>
-<script src="searchdata-v1.js" async="async"></script>
+<script>
+  Search.download(window.location.pathname.substr(0, window.location.pathname.lastIndexOf('/') + 1)  + 'searchdata-v1.bin');
+</script>
 </body>
 </html>
diff --git a/documentation/test_python/test_page.py b/documentation/test_python/test_page.py
@@ -58,6 +58,7 @@ def test(self):
                 'examples/advanced/barz.rst',
             ],
             'SEARCH_DISABLED': False,
+            'SEARCH_DOWNLOAD_BINARY': True,
             'PLUGINS': [
                 'm.sphinx'
             ]