Use gem search index instead of global index.

ruby · Aug 17, 2015 · cfde4f9 · cfde4f9
1 parent 4d81a1e
commit cfde4f9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/lib/rdoc/generator/template/darkfish/_head.rhtml b/lib/rdoc/generator/template/darkfish/_head.rhtml
@@ -4,6 +4,7 @@
 
 <script type="text/javascript">
   var rdoc_rel_prefix = "<%= asset_rel_prefix %>/";
+  var index_rel_prefix = "<%= rel_prefix %>/";
 </script>
 
 <script src="<%= asset_rel_prefix %>/js/jquery.js"></script>

diff --git a/lib/rdoc/generator/template/darkfish/js/darkfish.js b/lib/rdoc/generator/template/darkfish/js/darkfish.js
@@ -59,7 +59,7 @@ function hookSearch() {
     var html = '';
 
     // TODO add relative path to <script> per-page
-    html += '<p class="search-match"><a href="' + rdoc_rel_prefix + result.path + '">' + this.hlt(result.title);
+    html += '<p class="search-match"><a href="' + index_rel_prefix + result.path + '">' + this.hlt(result.title);
     if (result.params)
       html += '<span class="params">' + result.params + '</span>';
     html += '</a>';
@@ -121,9 +121,9 @@ function highlightClickTarget( event ) {
   };
 };
 
-function loadAsync(path, success) {
+function loadAsync(path, success, prefix) {
   $.ajax({
-    url: rdoc_rel_prefix + path,
+    url: prefix + path,
     dataType: 'script',
     success: success,
     cache: true
@@ -154,8 +154,8 @@ $(document).ready( function() {
     });
   }
 
-  loadAsync('js/navigation.js',   search_success_function('navigation_loaded'));
-  loadAsync('js/search.js',       search_success_function('search_loaded'));
-  loadAsync('js/search_index.js', search_success_function('search_index_loaded'));
-  loadAsync('js/searcher.js',     search_success_function('searcher_loaded'));
+  loadAsync('js/navigation.js',   search_success_function('navigation_loaded'), rdoc_rel_prefix);
+  loadAsync('js/search.js',       search_success_function('search_loaded'), rdoc_rel_prefix);
+  loadAsync('js/search_index.js', search_success_function('search_index_loaded'), index_rel_prefix);
+  loadAsync('js/searcher.js',     search_success_function('searcher_loaded'), rdoc_rel_prefix);
 });