Fix the search widget on non-root pages (#2125)

jdkoren · web-flow · commit 316917138948 · 2020-01-10T10:34:31.000-08:00
diff --git a/lib/resources/script.js b/lib/resources/script.js
@@ -100,6 +100,8 @@ function initSearch(name) {
     'constructor' : 4
   };
 
+  var baseHref = $('body').data('base-href');
+
   function findMatches(q) {
     var allMatches = []; // list of matches
 
@@ -226,7 +228,7 @@ function initSearch(name) {
           if (suggestion.length > 0) {
             var href = suggestion.data("href");
             if (href != null) {
-              window.location = href;
+              window.location = baseHref + href;
             }
           }
         }
@@ -235,14 +237,12 @@ function initSearch(name) {
 
     typeaheadElement.bind('typeahead:select', function(ev, suggestion) {
         selectedSuggestion = suggestion;
-        window.location = suggestion.href;
+        window.location = baseHref + suggestion.href;
     });
   }
 
   var jsonReq = new XMLHttpRequest();
-  var scriptUrl = URI(document.getElementById("dartdoc_script_js").src);
-
-  jsonReq.open('GET', URI(scriptUrl.directory() + '/..').absoluteTo(scriptUrl) + '/index.json', true);
+  jsonReq.open('GET', baseHref + 'index.json', true);
   jsonReq.addEventListener('load', function() {
     searchIndex = JSON.parse(jsonReq.responseText);
     initTypeahead();
diff --git a/lib/templates/_footer.html b/lib/templates/_footer.html
@@ -16,7 +16,7 @@
 <script src="{{^useBaseHref}}%%__HTMLBASE_dartdoc_internal__%%{{/useBaseHref}}static-assets/typeahead.bundle.min.js"></script>
 <script src="{{^useBaseHref}}%%__HTMLBASE_dartdoc_internal__%%{{/useBaseHref}}static-assets/highlight.pack.js"></script>
 <script src="{{^useBaseHref}}%%__HTMLBASE_dartdoc_internal__%%{{/useBaseHref}}static-assets/URI.js"></script>
-<script id="dartdoc_script_js" src="{{^useBaseHref}}%%__HTMLBASE_dartdoc_internal__%%{{/useBaseHref}}static-assets/script.js"></script>
+<script src="{{^useBaseHref}}%%__HTMLBASE_dartdoc_internal__%%{{/useBaseHref}}static-assets/script.js"></script>
 <!-- footer placeholder -->
 
 </body>
diff --git a/lib/templates/_head.html b/lib/templates/_head.html
@@ -29,7 +29,8 @@
   <!-- header placeholder -->
 </head>
 
-<body>
+{{! We don't use <base href>, but we do lookup the htmlBase from javascript. }}
+<body data-base-href="{{{htmlBase}}}">
 
 <div id="overlay-under-drawer"></div>
 
