Skip to content

Commit

Permalink
Rollup merge of rust-lang#84433 - GuillaumeGomez:search-input-blur, r…
Browse files Browse the repository at this point in the history
…=jsha

Prevent control, shift and alt keys to make search input lose focus

Part of rust-lang#84384.

r? ``@jsha``
  • Loading branch information
Dylan-DPC authored Apr 23, 2021
2 parents 35cda5b + a03cba3 commit 1ab01e8
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions src/librustdoc/html/static/search.js
Original file line number Diff line number Diff line change
Expand Up @@ -935,6 +935,9 @@ window.initSearch = function(rawSearchIndex) {
});
current += 1;
});
var SHIFT = 16;
var CTRL = 17;
var ALT = 18;

var currentTab = searchState.currentTab;
if (e.which === 38) { // up
Expand Down Expand Up @@ -967,10 +970,10 @@ window.initSearch = function(rawSearchIndex) {
e.preventDefault();
} else if (e.which === 13) { // return
if (actives[currentTab].length) {
document.location.href =
actives[currentTab][0].getElementsByTagName("a")[0].href;
var elem = actives[currentTab][0].getElementsByTagName("a")[0];
document.location.href = elem.href;
}
} else if (e.which === 16) { // shift
} else if ([SHIFT, CTRL, ALT].indexOf(e.which) !== -1) {
// Does nothing, it's just to avoid losing "focus" on the highlighted element.
} else if (actives[currentTab].length > 0) {
removeClass(actives[currentTab][0], "highlighted");
Expand Down

0 comments on commit 1ab01e8

Please sign in to comment.