bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #85506 - GuillaumeGomez:reset-focusedByTab, r=jsha

Browse source 
Reset "focusedByTab" field when doing another search

Fixes https://github.com/rust-lang/rust/issues/85467.

The problem was simply that we forget to reset the `focusedByTab` field, which was still referring to removed DOM elements.

r? ``@jsha``
This commit is contained in:
Guillaume Gomez 2021-05-21 20:06:06 +02:00 • committed by GitHub
commit 51a99eb603
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/librustdoc/html/static/search.js
View file

@ -885,12 +885,12 @@ window.initSearch = function(rawSearchIndex) {
focusSearchResult(); focusSearchResult();
} }
// focus the first search result on the active tab, or the result that // Focus the first search result on the active tab, or the result that
// was focused last time this tab was active. // was focused last time this tab was active.
function focusSearchResult() { function focusSearchResult() {
var target = searchState.focusedByTab[searchState.currentTab] || var target = searchState.focusedByTab[searchState.currentTab] ||
document.querySelectorAll(".search-results.active a").item(0) || document.querySelectorAll(".search-results.active a").item(0) ||
document.querySelectorAll("#titles > button").item(searchState.currentTab); document.querySelectorAll("#titles > button").item(searchState.currentTab);
if (target) { if (target) {
target.focus(); target.focus();
} }
@ -1076,6 +1076,8 @@ window.initSearch = function(rawSearchIndex) {
ret_others[0] + ret_in_args[0] + ret_returned[0] + "</div>"; ret_others[0] + ret_in_args[0] + ret_returned[0] + "</div>";
search.innerHTML = output; search.innerHTML = output;
// Reset focused elements.
searchState.focusedByTab = [null, null, null];
searchState.showResults(search); searchState.showResults(search);
var elems = document.getElementById("titles").childNodes; var elems = document.getElementById("titles").childNodes;
elems[0].onclick = function() { printTab(0); }; elems[0].onclick = function() { printTab(0); };
@ -1365,7 +1367,6 @@ window.initSearch = function(rawSearchIndex) {
if (e.which === 38) { // up if (e.which === 38) { // up
var previous = document.activeElement.previousElementSibling; var previous = document.activeElement.previousElementSibling;
if (previous) { if (previous) {
console.log("previousElementSibling", previous);
previous.focus(); previous.focus();
} else { } else {
searchState.focus(); searchState.focus();