Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Save selected search tab #45281

Merged
merged 1 commit into from
Oct 18, 2017
Merged

Save selected search tab #45281

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 23 additions & 5 deletions src/librustdoc/html/static/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,13 @@
"associatedconstant",
"union"];

// On the search screen, so you remain on the last tab you opened.
//
// 0 for "Types/modules"
// 1 for "As parameters"
// 2 for "As return value"
var currentTab = 0;

function hasClass(elem, className) {
if (elem && className && elem.className) {
var elemClass = elem.className;
Expand Down Expand Up @@ -747,7 +754,7 @@

var output = '';
if (array.length > 0) {
output = `<table class="search-results"${extraStyle}>`;
output = '<table class="search-results"' + extraStyle + '>';
var shown = [];

array.forEach(function(item) {
Expand Down Expand Up @@ -801,24 +808,32 @@
});
output += '</table>';
} else {
output = `<div class="search-failed"${extraStyle}>No results :(<br/>` +
output = '<div class="search-failed"' + extraStyle + '>No results :(<br/>' +
'Try on <a href="https://duckduckgo.com/?q=' +
encodeURIComponent('rust ' + query.query) +
'">DuckDuckGo</a>?</div>';
}
return output;
}

function makeTabHeader(tabNb, text) {
if (currentTab === tabNb) {
return '<div class="selected">' + text + '</div>';
}
return '<div>' + text + '</div>';
}

function showResults(results) {
var output, query = getQuery();

currentResults = query.id;
output = '<h1>Results for ' + escape(query.query) +
(query.type ? ' (type: ' + escape(query.type) + ')' : '') + '</h1>' +
'<div id="titles">' +
'<div class="selected">Types/modules</div>' +
'<div>As parameters</div>' +
'<div>As return value</div></div><div id="results">';
makeTabHeader(0, "Types/modules") +
makeTabHeader(1, "As parameters") +
makeTabHeader(2, "As return value") +
'</div><div id="results">';

output += addTab(results['others'], query);
output += addTab(results['in_args'], query, false);
Expand Down Expand Up @@ -1394,6 +1409,9 @@

// In the search display, allows to switch between tabs.
function printTab(nb) {
if (nb === 0 || nb === 1 || nb === 2) {
currentTab = nb;
}
var nb_copy = nb;
onEach(document.getElementById('titles').childNodes, function(elem) {
if (nb_copy === 0) {
Expand Down