Skip to content

Commit

Permalink
Fix items counts in search results
Browse files Browse the repository at this point in the history
  • Loading branch information
GuillaumeGomez committed May 12, 2018
1 parent 6a4bdda commit 8fab482
Showing 1 changed file with 15 additions and 12 deletions.
27 changes: 15 additions & 12 deletions src/librustdoc/html/static/main.js
Expand Up @@ -1256,6 +1256,7 @@

var output = '';
var duplicates = {};
var length = 0;
if (array.length > 0) {
output = '<table class="search-results"' + extraStyle + '>';
var shown = [];
Expand All @@ -1280,6 +1281,7 @@
}
duplicates[fullPath] = true;
}
length += 1;

output += '<tr class="' + type + ' result"><td>' +
'<a href="' + item.href + '">' +
Expand All @@ -1299,7 +1301,7 @@
encodeURIComponent('rust ' + query.query) +
'">DuckDuckGo</a>?</div>';
}
return output;
return [output, length];
}

function makeTabHeader(tabNb, text, nbElems) {
Expand All @@ -1320,21 +1322,22 @@
document.body.appendChild(elem);
elem.click();
}
var output, query = getQuery(search_input.value);
var query = getQuery(search_input.value);

currentResults = query.id;
output = '<h1>Results for ' + escape(query.query) +

var ret_others = addTab(results['others'], query);
var ret_in_args = addTab(results['in_args'], query, false);
var ret_returned = addTab(results['returned'], query, false);

var output = '<h1>Results for ' + escape(query.query) +
(query.type ? ' (type: ' + escape(query.type) + ')' : '') + '</h1>' +
'<div id="titles">' +
makeTabHeader(0, "In Names", results['others'].length) +
makeTabHeader(1, "In Parameters", results['in_args'].length) +
makeTabHeader(2, "In Return Types", results['returned'].length) +
'</div><div id="results">';

output += addTab(results['others'], query);
output += addTab(results['in_args'], query, false);
output += addTab(results['returned'], query, false);
output += '</div>';
makeTabHeader(0, "In Names", ret_others[1]) +
makeTabHeader(1, "In Parameters", ret_in_args[1]) +
makeTabHeader(2, "In Return Types", ret_returned[1]) +
'</div><div id="results">' +
ret_others[0] + ret_in_args[0] + ret_returned[0] + '</div>';

addClass(document.getElementById('main'), 'hidden');
var search = document.getElementById('search');
Expand Down

0 comments on commit 8fab482

Please sign in to comment.